diff --git a/.landscape.yml b/.landscape.yml index 1cf78412c..d4f32733f 100644 --- a/.landscape.yml +++ b/.landscape.yml @@ -1,6 +1,6 @@ ignore-paths: - - mitmproxy/docs - - mitmproxy/examples + - docs + - examples - mitmproxy/mitmproxy/contrib - mitmproxy/web max-line-length: 140 diff --git a/.travis.yml b/.travis.yml index 06b31773c..5804b5c7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: env: SCOPE="netlib" NO_ALPN=1 - python: 2.7 env: DOCS=1 - script: 'cd mitmproxy/docs && make html' + script: 'cd docs && make html' allow_failures: - python: pypy diff --git a/mitmproxy/docs/.gitignore b/docs/.gitignore similarity index 100% rename from mitmproxy/docs/.gitignore rename to docs/.gitignore diff --git a/mitmproxy/docs/Makefile b/docs/Makefile similarity index 100% rename from mitmproxy/docs/Makefile rename to docs/Makefile diff --git a/mitmproxy/docs/_templates/page.html b/docs/_templates/page.html similarity index 100% rename from mitmproxy/docs/_templates/page.html rename to docs/_templates/page.html diff --git a/mitmproxy/docs/certinstall-webapp.png b/docs/certinstall-webapp.png similarity index 100% rename from mitmproxy/docs/certinstall-webapp.png rename to docs/certinstall-webapp.png diff --git a/mitmproxy/docs/certinstall.rst b/docs/certinstall.rst similarity index 100% rename from mitmproxy/docs/certinstall.rst rename to docs/certinstall.rst diff --git a/mitmproxy/docs/conf.py b/docs/conf.py similarity index 100% rename from mitmproxy/docs/conf.py rename to docs/conf.py diff --git a/mitmproxy/docs/config.rst b/docs/config.rst similarity index 100% rename from mitmproxy/docs/config.rst rename to docs/config.rst diff --git a/mitmproxy/docs/custom-routing.txt b/docs/custom-routing.txt similarity index 100% rename from mitmproxy/docs/custom-routing.txt rename to docs/custom-routing.txt diff --git a/mitmproxy/docs/dev/addingviews.html b/docs/dev/addingviews.html similarity index 100% rename from mitmproxy/docs/dev/addingviews.html rename to docs/dev/addingviews.html diff --git a/mitmproxy/docs/dev/architecture.rst b/docs/dev/architecture.rst similarity index 100% rename from mitmproxy/docs/dev/architecture.rst rename to docs/dev/architecture.rst diff --git a/mitmproxy/docs/dev/exceptions.rst b/docs/dev/exceptions.rst similarity index 100% rename from mitmproxy/docs/dev/exceptions.rst rename to docs/dev/exceptions.rst diff --git a/mitmproxy/docs/dev/models.rst b/docs/dev/models.rst similarity index 100% rename from mitmproxy/docs/dev/models.rst rename to docs/dev/models.rst diff --git a/mitmproxy/docs/dev/protocols.rst b/docs/dev/protocols.rst similarity index 100% rename from mitmproxy/docs/dev/protocols.rst rename to docs/dev/protocols.rst diff --git a/mitmproxy/docs/dev/proxy.rst b/docs/dev/proxy.rst similarity index 100% rename from mitmproxy/docs/dev/proxy.rst rename to docs/dev/proxy.rst diff --git a/mitmproxy/docs/dev/sslkeylogfile.rst b/docs/dev/sslkeylogfile.rst similarity index 100% rename from mitmproxy/docs/dev/sslkeylogfile.rst rename to docs/dev/sslkeylogfile.rst diff --git a/mitmproxy/docs/dev/testing.rst b/docs/dev/testing.rst similarity index 100% rename from mitmproxy/docs/dev/testing.rst rename to docs/dev/testing.rst diff --git a/mitmproxy/docs/favicon.ico b/docs/favicon.ico similarity index 100% rename from mitmproxy/docs/favicon.ico rename to docs/favicon.ico diff --git a/mitmproxy/docs/features/anticache.rst b/docs/features/anticache.rst similarity index 100% rename from mitmproxy/docs/features/anticache.rst rename to docs/features/anticache.rst diff --git a/mitmproxy/docs/features/clientreplay.rst b/docs/features/clientreplay.rst similarity index 100% rename from mitmproxy/docs/features/clientreplay.rst rename to docs/features/clientreplay.rst diff --git a/mitmproxy/docs/features/filters.rst b/docs/features/filters.rst similarity index 100% rename from mitmproxy/docs/features/filters.rst rename to docs/features/filters.rst diff --git a/mitmproxy/docs/features/passthrough.rst b/docs/features/passthrough.rst similarity index 100% rename from mitmproxy/docs/features/passthrough.rst rename to docs/features/passthrough.rst diff --git a/mitmproxy/docs/features/proxyauth.rst b/docs/features/proxyauth.rst similarity index 100% rename from mitmproxy/docs/features/proxyauth.rst rename to docs/features/proxyauth.rst diff --git a/mitmproxy/docs/features/replacements.rst b/docs/features/replacements.rst similarity index 100% rename from mitmproxy/docs/features/replacements.rst rename to docs/features/replacements.rst diff --git a/mitmproxy/docs/features/responsestreaming.rst b/docs/features/responsestreaming.rst similarity index 100% rename from mitmproxy/docs/features/responsestreaming.rst rename to docs/features/responsestreaming.rst diff --git a/mitmproxy/docs/features/reverseproxy.rst b/docs/features/reverseproxy.rst similarity index 100% rename from mitmproxy/docs/features/reverseproxy.rst rename to docs/features/reverseproxy.rst diff --git a/mitmproxy/docs/features/serverreplay.rst b/docs/features/serverreplay.rst similarity index 100% rename from mitmproxy/docs/features/serverreplay.rst rename to docs/features/serverreplay.rst diff --git a/mitmproxy/docs/features/setheaders.rst b/docs/features/setheaders.rst similarity index 100% rename from mitmproxy/docs/features/setheaders.rst rename to docs/features/setheaders.rst diff --git a/mitmproxy/docs/features/socksproxy.rst b/docs/features/socksproxy.rst similarity index 100% rename from mitmproxy/docs/features/socksproxy.rst rename to docs/features/socksproxy.rst diff --git a/mitmproxy/docs/features/sticky.rst b/docs/features/sticky.rst similarity index 100% rename from mitmproxy/docs/features/sticky.rst rename to docs/features/sticky.rst diff --git a/mitmproxy/docs/features/tcpproxy.rst b/docs/features/tcpproxy.rst similarity index 100% rename from mitmproxy/docs/features/tcpproxy.rst rename to docs/features/tcpproxy.rst diff --git a/mitmproxy/docs/features/upstreamcerts.rst b/docs/features/upstreamcerts.rst similarity index 100% rename from mitmproxy/docs/features/upstreamcerts.rst rename to docs/features/upstreamcerts.rst diff --git a/mitmproxy/docs/features/upstreamproxy.rst b/docs/features/upstreamproxy.rst similarity index 100% rename from mitmproxy/docs/features/upstreamproxy.rst rename to docs/features/upstreamproxy.rst diff --git a/mitmproxy/docs/howmitmproxy.rst b/docs/howmitmproxy.rst similarity index 100% rename from mitmproxy/docs/howmitmproxy.rst rename to docs/howmitmproxy.rst diff --git a/mitmproxy/docs/index.rst b/docs/index.rst similarity index 100% rename from mitmproxy/docs/index.rst rename to docs/index.rst diff --git a/mitmproxy/docs/install.rst b/docs/install.rst similarity index 100% rename from mitmproxy/docs/install.rst rename to docs/install.rst diff --git a/mitmproxy/docs/introduction.rst b/docs/introduction.rst similarity index 100% rename from mitmproxy/docs/introduction.rst rename to docs/introduction.rst diff --git a/mitmproxy/docs/mitmdump.rst b/docs/mitmdump.rst similarity index 100% rename from mitmproxy/docs/mitmdump.rst rename to docs/mitmdump.rst diff --git a/mitmproxy/docs/mitmproxy-docs.png b/docs/mitmproxy-docs.png similarity index 100% rename from mitmproxy/docs/mitmproxy-docs.png rename to docs/mitmproxy-docs.png diff --git a/mitmproxy/docs/mitmproxy-long.png b/docs/mitmproxy-long.png similarity index 100% rename from mitmproxy/docs/mitmproxy-long.png rename to docs/mitmproxy-long.png diff --git a/mitmproxy/docs/mitmproxy.rst b/docs/mitmproxy.rst similarity index 100% rename from mitmproxy/docs/mitmproxy.rst rename to docs/mitmproxy.rst diff --git a/mitmproxy/docs/modes.rst b/docs/modes.rst similarity index 100% rename from mitmproxy/docs/modes.rst rename to docs/modes.rst diff --git a/mitmproxy/docs/schematics/_explicit.graffle/data.plist b/docs/schematics/_explicit.graffle/data.plist similarity index 100% rename from mitmproxy/docs/schematics/_explicit.graffle/data.plist rename to docs/schematics/_explicit.graffle/data.plist diff --git a/mitmproxy/docs/schematics/_explicit.graffle/image3.icns b/docs/schematics/_explicit.graffle/image3.icns similarity index 100% rename from mitmproxy/docs/schematics/_explicit.graffle/image3.icns rename to docs/schematics/_explicit.graffle/image3.icns diff --git a/mitmproxy/docs/schematics/_explicit.graffle/image6.tiff b/docs/schematics/_explicit.graffle/image6.tiff similarity index 100% rename from mitmproxy/docs/schematics/_explicit.graffle/image6.tiff rename to docs/schematics/_explicit.graffle/image6.tiff diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/data.plist b/docs/schematics/_explicit_https.graffle/data.plist similarity index 100% rename from mitmproxy/docs/schematics/_explicit_https.graffle/data.plist rename to docs/schematics/_explicit_https.graffle/data.plist diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns b/docs/schematics/_explicit_https.graffle/image3.icns similarity index 100% rename from mitmproxy/docs/schematics/_explicit_https.graffle/image3.icns rename to docs/schematics/_explicit_https.graffle/image3.icns diff --git a/mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff b/docs/schematics/_explicit_https.graffle/image6.tiff similarity index 100% rename from mitmproxy/docs/schematics/_explicit_https.graffle/image6.tiff rename to docs/schematics/_explicit_https.graffle/image6.tiff diff --git a/mitmproxy/docs/schematics/_transparent.graffle/data.plist b/docs/schematics/_transparent.graffle/data.plist similarity index 100% rename from mitmproxy/docs/schematics/_transparent.graffle/data.plist rename to docs/schematics/_transparent.graffle/data.plist diff --git a/mitmproxy/docs/schematics/_transparent.graffle/image3.icns b/docs/schematics/_transparent.graffle/image3.icns similarity index 100% rename from mitmproxy/docs/schematics/_transparent.graffle/image3.icns rename to docs/schematics/_transparent.graffle/image3.icns diff --git a/mitmproxy/docs/schematics/_transparent.graffle/image6.tiff b/docs/schematics/_transparent.graffle/image6.tiff similarity index 100% rename from mitmproxy/docs/schematics/_transparent.graffle/image6.tiff rename to docs/schematics/_transparent.graffle/image6.tiff diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/data.plist b/docs/schematics/_transparent_https.graffle/data.plist similarity index 100% rename from mitmproxy/docs/schematics/_transparent_https.graffle/data.plist rename to docs/schematics/_transparent_https.graffle/data.plist diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns b/docs/schematics/_transparent_https.graffle/image3.icns similarity index 100% rename from mitmproxy/docs/schematics/_transparent_https.graffle/image3.icns rename to docs/schematics/_transparent_https.graffle/image3.icns diff --git a/mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff b/docs/schematics/_transparent_https.graffle/image6.tiff similarity index 100% rename from mitmproxy/docs/schematics/_transparent_https.graffle/image6.tiff rename to docs/schematics/_transparent_https.graffle/image6.tiff diff --git a/mitmproxy/docs/schematics/architecture.pdf b/docs/schematics/architecture.pdf similarity index 100% rename from mitmproxy/docs/schematics/architecture.pdf rename to docs/schematics/architecture.pdf diff --git a/mitmproxy/docs/schematics/architecture.png b/docs/schematics/architecture.png similarity index 100% rename from mitmproxy/docs/schematics/architecture.png rename to docs/schematics/architecture.png diff --git a/mitmproxy/docs/schematics/architecture.vsdx b/docs/schematics/architecture.vsdx similarity index 100% rename from mitmproxy/docs/schematics/architecture.vsdx rename to docs/schematics/architecture.vsdx diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png b/docs/schematics/how-mitmproxy-works-explicit-https.png similarity index 100% rename from mitmproxy/docs/schematics/how-mitmproxy-works-explicit-https.png rename to docs/schematics/how-mitmproxy-works-explicit-https.png diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png b/docs/schematics/how-mitmproxy-works-explicit.png similarity index 100% rename from mitmproxy/docs/schematics/how-mitmproxy-works-explicit.png rename to docs/schematics/how-mitmproxy-works-explicit.png diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png b/docs/schematics/how-mitmproxy-works-transparent-https.png similarity index 100% rename from mitmproxy/docs/schematics/how-mitmproxy-works-transparent-https.png rename to docs/schematics/how-mitmproxy-works-transparent-https.png diff --git a/mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png b/docs/schematics/how-mitmproxy-works-transparent.png similarity index 100% rename from mitmproxy/docs/schematics/how-mitmproxy-works-transparent.png rename to docs/schematics/how-mitmproxy-works-transparent.png diff --git a/mitmproxy/docs/schematics/proxy-modes-flowchart.png b/docs/schematics/proxy-modes-flowchart.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-flowchart.png rename to docs/schematics/proxy-modes-flowchart.png diff --git a/mitmproxy/docs/schematics/proxy-modes-regular.png b/docs/schematics/proxy-modes-regular.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-regular.png rename to docs/schematics/proxy-modes-regular.png diff --git a/mitmproxy/docs/schematics/proxy-modes-reverse.png b/docs/schematics/proxy-modes-reverse.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-reverse.png rename to docs/schematics/proxy-modes-reverse.png diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-1.png b/docs/schematics/proxy-modes-transparent-1.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-transparent-1.png rename to docs/schematics/proxy-modes-transparent-1.png diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-2.png b/docs/schematics/proxy-modes-transparent-2.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-transparent-2.png rename to docs/schematics/proxy-modes-transparent-2.png diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-3.png b/docs/schematics/proxy-modes-transparent-3.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-transparent-3.png rename to docs/schematics/proxy-modes-transparent-3.png diff --git a/mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png b/docs/schematics/proxy-modes-transparent-wrong.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-transparent-wrong.png rename to docs/schematics/proxy-modes-transparent-wrong.png diff --git a/mitmproxy/docs/schematics/proxy-modes-upstream.png b/docs/schematics/proxy-modes-upstream.png similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes-upstream.png rename to docs/schematics/proxy-modes-upstream.png diff --git a/mitmproxy/docs/schematics/proxy-modes.pdf b/docs/schematics/proxy-modes.pdf similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes.pdf rename to docs/schematics/proxy-modes.pdf diff --git a/mitmproxy/docs/schematics/proxy-modes.vsdx b/docs/schematics/proxy-modes.vsdx similarity index 100% rename from mitmproxy/docs/schematics/proxy-modes.vsdx rename to docs/schematics/proxy-modes.vsdx diff --git a/mitmproxy/docs/screenshots/firefox3-import.jpg b/docs/screenshots/firefox3-import.jpg similarity index 100% rename from mitmproxy/docs/screenshots/firefox3-import.jpg rename to docs/screenshots/firefox3-import.jpg diff --git a/mitmproxy/docs/screenshots/firefox3-trust.jpg b/docs/screenshots/firefox3-trust.jpg similarity index 100% rename from mitmproxy/docs/screenshots/firefox3-trust.jpg rename to docs/screenshots/firefox3-trust.jpg diff --git a/mitmproxy/docs/screenshots/firefox3.jpg b/docs/screenshots/firefox3.jpg similarity index 100% rename from mitmproxy/docs/screenshots/firefox3.jpg rename to docs/screenshots/firefox3.jpg diff --git a/mitmproxy/docs/screenshots/ios-gateway.png b/docs/screenshots/ios-gateway.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-gateway.png rename to docs/screenshots/ios-gateway.png diff --git a/mitmproxy/docs/screenshots/ios-installed.png b/docs/screenshots/ios-installed.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-installed.png rename to docs/screenshots/ios-installed.png diff --git a/mitmproxy/docs/screenshots/ios-manual.png b/docs/screenshots/ios-manual.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-manual.png rename to docs/screenshots/ios-manual.png diff --git a/mitmproxy/docs/screenshots/ios-profile.png b/docs/screenshots/ios-profile.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-profile.png rename to docs/screenshots/ios-profile.png diff --git a/mitmproxy/docs/screenshots/ios-reverse.png b/docs/screenshots/ios-reverse.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-reverse.png rename to docs/screenshots/ios-reverse.png diff --git a/mitmproxy/docs/screenshots/ios-warning.png b/docs/screenshots/ios-warning.png similarity index 100% rename from mitmproxy/docs/screenshots/ios-warning.png rename to docs/screenshots/ios-warning.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-flowview.png b/docs/screenshots/mitmproxy-flowview.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-flowview.png rename to docs/screenshots/mitmproxy-flowview.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png b/docs/screenshots/mitmproxy-intercept-filt.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-intercept-filt.png rename to docs/screenshots/mitmproxy-intercept-filt.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png b/docs/screenshots/mitmproxy-intercept-mid.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-intercept-mid.png rename to docs/screenshots/mitmproxy-intercept-mid.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-options.png b/docs/screenshots/mitmproxy-intercept-options.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-intercept-options.png rename to docs/screenshots/mitmproxy-intercept-options.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-intercept-result.png b/docs/screenshots/mitmproxy-intercept-result.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-intercept-result.png rename to docs/screenshots/mitmproxy-intercept-result.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png b/docs/screenshots/mitmproxy-kveditor-editmode.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-kveditor-editmode.png rename to docs/screenshots/mitmproxy-kveditor-editmode.png diff --git a/mitmproxy/docs/screenshots/mitmproxy-kveditor.png b/docs/screenshots/mitmproxy-kveditor.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy-kveditor.png rename to docs/screenshots/mitmproxy-kveditor.png diff --git a/mitmproxy/docs/screenshots/mitmproxy.png b/docs/screenshots/mitmproxy.png similarity index 100% rename from mitmproxy/docs/screenshots/mitmproxy.png rename to docs/screenshots/mitmproxy.png diff --git a/mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png b/docs/screenshots/osx-addcert-alwaystrust.png similarity index 100% rename from mitmproxy/docs/screenshots/osx-addcert-alwaystrust.png rename to docs/screenshots/osx-addcert-alwaystrust.png diff --git a/mitmproxy/docs/screenshots/win7-certstore-trustedroot.png b/docs/screenshots/win7-certstore-trustedroot.png similarity index 100% rename from mitmproxy/docs/screenshots/win7-certstore-trustedroot.png rename to docs/screenshots/win7-certstore-trustedroot.png diff --git a/mitmproxy/docs/screenshots/win7-certstore.png b/docs/screenshots/win7-certstore.png similarity index 100% rename from mitmproxy/docs/screenshots/win7-certstore.png rename to docs/screenshots/win7-certstore.png diff --git a/mitmproxy/docs/screenshots/win7-wizard.png b/docs/screenshots/win7-wizard.png similarity index 100% rename from mitmproxy/docs/screenshots/win7-wizard.png rename to docs/screenshots/win7-wizard.png diff --git a/mitmproxy/docs/screenshots/winpythoninstaller.jpg b/docs/screenshots/winpythoninstaller.jpg similarity index 100% rename from mitmproxy/docs/screenshots/winpythoninstaller.jpg rename to docs/screenshots/winpythoninstaller.jpg diff --git a/mitmproxy/docs/scripting/inlinescripts.rst b/docs/scripting/inlinescripts.rst similarity index 100% rename from mitmproxy/docs/scripting/inlinescripts.rst rename to docs/scripting/inlinescripts.rst diff --git a/mitmproxy/docs/scripting/mitmproxy.rst b/docs/scripting/mitmproxy.rst similarity index 100% rename from mitmproxy/docs/scripting/mitmproxy.rst rename to docs/scripting/mitmproxy.rst diff --git a/mitmproxy/docs/transparent.rst b/docs/transparent.rst similarity index 100% rename from mitmproxy/docs/transparent.rst rename to docs/transparent.rst diff --git a/mitmproxy/docs/transparent/linux.rst b/docs/transparent/linux.rst similarity index 100% rename from mitmproxy/docs/transparent/linux.rst rename to docs/transparent/linux.rst diff --git a/mitmproxy/docs/transparent/osx.rst b/docs/transparent/osx.rst similarity index 100% rename from mitmproxy/docs/transparent/osx.rst rename to docs/transparent/osx.rst diff --git a/mitmproxy/docs/tutorials/30second.rst b/docs/tutorials/30second.rst similarity index 100% rename from mitmproxy/docs/tutorials/30second.rst rename to docs/tutorials/30second.rst diff --git a/mitmproxy/docs/tutorials/gamecenter.rst b/docs/tutorials/gamecenter.rst similarity index 100% rename from mitmproxy/docs/tutorials/gamecenter.rst rename to docs/tutorials/gamecenter.rst diff --git a/mitmproxy/docs/tutorials/leaderboard.png b/docs/tutorials/leaderboard.png similarity index 100% rename from mitmproxy/docs/tutorials/leaderboard.png rename to docs/tutorials/leaderboard.png diff --git a/mitmproxy/docs/tutorials/one.png b/docs/tutorials/one.png similarity index 100% rename from mitmproxy/docs/tutorials/one.png rename to docs/tutorials/one.png diff --git a/mitmproxy/docs/tutorials/supermega.png b/docs/tutorials/supermega.png similarity index 100% rename from mitmproxy/docs/tutorials/supermega.png rename to docs/tutorials/supermega.png diff --git a/mitmproxy/docs/tutorials/transparent-dhcp.rst b/docs/tutorials/transparent-dhcp.rst similarity index 100% rename from mitmproxy/docs/tutorials/transparent-dhcp.rst rename to docs/tutorials/transparent-dhcp.rst diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png b/docs/tutorials/transparent-dhcp/step1_proxy.png similarity index 100% rename from mitmproxy/docs/tutorials/transparent-dhcp/step1_proxy.png rename to docs/tutorials/transparent-dhcp/step1_proxy.png diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png b/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png similarity index 100% rename from mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth0.png rename to docs/tutorials/transparent-dhcp/step1_vbox_eth0.png diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png b/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png similarity index 100% rename from mitmproxy/docs/tutorials/transparent-dhcp/step1_vbox_eth1.png rename to docs/tutorials/transparent-dhcp/step1_vbox_eth1.png diff --git a/mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png b/docs/tutorials/transparent-dhcp/step2_proxied_vm.png similarity index 100% rename from mitmproxy/docs/tutorials/transparent-dhcp/step2_proxied_vm.png rename to docs/tutorials/transparent-dhcp/step2_proxied_vm.png diff --git a/mitmproxy/examples/README b/examples/README similarity index 100% rename from mitmproxy/examples/README rename to examples/README diff --git a/mitmproxy/examples/add_header.py b/examples/add_header.py similarity index 100% rename from mitmproxy/examples/add_header.py rename to examples/add_header.py diff --git a/mitmproxy/examples/change_upstream_proxy.py b/examples/change_upstream_proxy.py similarity index 100% rename from mitmproxy/examples/change_upstream_proxy.py rename to examples/change_upstream_proxy.py diff --git a/mitmproxy/examples/custom_contentviews.py b/examples/custom_contentviews.py similarity index 100% rename from mitmproxy/examples/custom_contentviews.py rename to examples/custom_contentviews.py diff --git a/mitmproxy/examples/dns_spoofing.py b/examples/dns_spoofing.py similarity index 100% rename from mitmproxy/examples/dns_spoofing.py rename to examples/dns_spoofing.py diff --git a/mitmproxy/examples/dup_and_replay.py b/examples/dup_and_replay.py similarity index 100% rename from mitmproxy/examples/dup_and_replay.py rename to examples/dup_and_replay.py diff --git a/mitmproxy/examples/filt.py b/examples/filt.py similarity index 100% rename from mitmproxy/examples/filt.py rename to examples/filt.py diff --git a/mitmproxy/examples/flowbasic b/examples/flowbasic similarity index 100% rename from mitmproxy/examples/flowbasic rename to examples/flowbasic diff --git a/mitmproxy/examples/flowwriter.py b/examples/flowwriter.py similarity index 100% rename from mitmproxy/examples/flowwriter.py rename to examples/flowwriter.py diff --git a/mitmproxy/examples/har_extractor.py b/examples/har_extractor.py similarity index 100% rename from mitmproxy/examples/har_extractor.py rename to examples/har_extractor.py diff --git a/mitmproxy/examples/iframe_injector.py b/examples/iframe_injector.py similarity index 100% rename from mitmproxy/examples/iframe_injector.py rename to examples/iframe_injector.py diff --git a/mitmproxy/examples/mitmproxywrapper.py b/examples/mitmproxywrapper.py similarity index 100% rename from mitmproxy/examples/mitmproxywrapper.py rename to examples/mitmproxywrapper.py diff --git a/mitmproxy/examples/modify_form.py b/examples/modify_form.py similarity index 100% rename from mitmproxy/examples/modify_form.py rename to examples/modify_form.py diff --git a/mitmproxy/examples/modify_querystring.py b/examples/modify_querystring.py similarity index 100% rename from mitmproxy/examples/modify_querystring.py rename to examples/modify_querystring.py diff --git a/mitmproxy/examples/modify_response_body.py b/examples/modify_response_body.py similarity index 100% rename from mitmproxy/examples/modify_response_body.py rename to examples/modify_response_body.py diff --git a/mitmproxy/examples/nonblocking.py b/examples/nonblocking.py similarity index 100% rename from mitmproxy/examples/nonblocking.py rename to examples/nonblocking.py diff --git a/mitmproxy/examples/proxapp.py b/examples/proxapp.py similarity index 100% rename from mitmproxy/examples/proxapp.py rename to examples/proxapp.py diff --git a/mitmproxy/examples/read_dumpfile b/examples/read_dumpfile similarity index 100% rename from mitmproxy/examples/read_dumpfile rename to examples/read_dumpfile diff --git a/mitmproxy/examples/redirect_requests.py b/examples/redirect_requests.py similarity index 100% rename from mitmproxy/examples/redirect_requests.py rename to examples/redirect_requests.py diff --git a/mitmproxy/examples/sslstrip.py b/examples/sslstrip.py similarity index 100% rename from mitmproxy/examples/sslstrip.py rename to examples/sslstrip.py diff --git a/mitmproxy/examples/stickycookies b/examples/stickycookies similarity index 100% rename from mitmproxy/examples/stickycookies rename to examples/stickycookies diff --git a/mitmproxy/examples/stream.py b/examples/stream.py similarity index 100% rename from mitmproxy/examples/stream.py rename to examples/stream.py diff --git a/mitmproxy/examples/stream_modify.py b/examples/stream_modify.py similarity index 100% rename from mitmproxy/examples/stream_modify.py rename to examples/stream_modify.py diff --git a/mitmproxy/examples/stub.py b/examples/stub.py similarity index 100% rename from mitmproxy/examples/stub.py rename to examples/stub.py diff --git a/mitmproxy/examples/tcp_message.py b/examples/tcp_message.py similarity index 100% rename from mitmproxy/examples/tcp_message.py rename to examples/tcp_message.py diff --git a/mitmproxy/examples/tls_passthrough.py b/examples/tls_passthrough.py similarity index 100% rename from mitmproxy/examples/tls_passthrough.py rename to examples/tls_passthrough.py diff --git a/mitmproxy/examples/upsidedownternet.py b/examples/upsidedownternet.py similarity index 100% rename from mitmproxy/examples/upsidedownternet.py rename to examples/upsidedownternet.py diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py index 6920c8e90..54e6e753c 100644 --- a/test/mitmproxy/test_examples.py +++ b/test/mitmproxy/test_examples.py @@ -5,7 +5,7 @@ from . import tservers def test_load_scripts(): - example_dir = utils.Data("mitmproxy").path("../examples") + example_dir = utils.Data("mitmproxy").path("../../examples") scripts = glob.glob("%s/*.py" % example_dir) tmaster = tservers.TestMaster(config.ProxyConfig())