From 36e070ee25ab09ecb9b38dd7f2c5cd8de0073c10 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 18 Feb 2016 10:15:59 +1300 Subject: Pull bin to the top, move pathod examples to examples dir --- bin/mitmdump | 3 +++ bin/mitmproxy | 3 +++ bin/mitmweb | 4 ++++ bin/pathoc | 6 ++++++ bin/pathod | 6 ++++++ examples/pathod/libpathod_pathoc.py | 7 +++++++ examples/pathod/test_context.py | 23 ++++++++++++++++++++++ examples/pathod/test_setup.py | 31 +++++++++++++++++++++++++++++ examples/pathod/test_setupall.py | 39 +++++++++++++++++++++++++++++++++++++ mitmproxy/bin/mitmdump | 3 --- mitmproxy/bin/mitmproxy | 3 --- mitmproxy/bin/mitmweb | 4 ---- pathod/bin/pathoc | 6 ------ pathod/bin/pathod | 6 ------ pathod/examples/libpathod_pathoc.py | 7 ------- pathod/examples/test_context.py | 23 ---------------------- pathod/examples/test_setup.py | 31 ----------------------------- pathod/examples/test_setupall.py | 39 ------------------------------------- release/mitmdump.spec | 2 +- release/mitmproxy.spec | 2 +- release/mitmweb.spec | 2 +- release/pathoc.spec | 2 +- release/pathod.spec | 2 +- 23 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 bin/mitmdump create mode 100755 bin/mitmproxy create mode 100755 bin/mitmweb create mode 100755 bin/pathoc create mode 100755 bin/pathod create mode 100644 examples/pathod/libpathod_pathoc.py create mode 100644 examples/pathod/test_context.py create mode 100644 examples/pathod/test_setup.py create mode 100644 examples/pathod/test_setupall.py delete mode 100644 mitmproxy/bin/mitmdump delete mode 100755 mitmproxy/bin/mitmproxy delete mode 100755 mitmproxy/bin/mitmweb delete mode 100755 pathod/bin/pathoc delete mode 100755 pathod/bin/pathod delete mode 100644 pathod/examples/libpathod_pathoc.py delete mode 100644 pathod/examples/test_context.py delete mode 100644 pathod/examples/test_setup.py delete mode 100644 pathod/examples/test_setupall.py diff --git a/bin/mitmdump b/bin/mitmdump new file mode 100644 index 00000000..2483be4f --- /dev/null +++ b/bin/mitmdump @@ -0,0 +1,3 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmdump +mitmdump() diff --git a/bin/mitmproxy b/bin/mitmproxy new file mode 100755 index 00000000..a3d7615d --- /dev/null +++ b/bin/mitmproxy @@ -0,0 +1,3 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmproxy +mitmproxy() diff --git a/bin/mitmweb b/bin/mitmweb new file mode 100755 index 00000000..14188a33 --- /dev/null +++ b/bin/mitmweb @@ -0,0 +1,4 @@ +#!/usr/bin/env python +from mitmproxy.main import mitmweb + +mitmweb() diff --git a/bin/pathoc b/bin/pathoc new file mode 100755 index 00000000..ab62d631 --- /dev/null +++ b/bin/pathoc @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from pathod import pathoc_cmdline as cmdline + +if __name__ == "__main__": + cmdline.go_pathoc() diff --git a/bin/pathod b/bin/pathod new file mode 100755 index 00000000..af0c118b --- /dev/null +++ b/bin/pathod @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +from pathod import pathod_cmdline as cmdline + +if __name__ == "__main__": + cmdline.go_pathod() diff --git a/examples/pathod/libpathod_pathoc.py b/examples/pathod/libpathod_pathoc.py new file mode 100644 index 00000000..587c0e4c --- /dev/null +++ b/examples/pathod/libpathod_pathoc.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python +from pathod import pathoc + +p = pathoc.Pathoc(("google.com", 80)) +p.connect() +print p.request("get:/") +print p.request("get:/foo") diff --git a/examples/pathod/test_context.py b/examples/pathod/test_context.py new file mode 100644 index 00000000..8db4331f --- /dev/null +++ b/examples/pathod/test_context.py @@ -0,0 +1,23 @@ +import requests +from pathod import test + + +def test_simple(): + """ + Testing the requests module with + a pathod context manager. + """ + # Start pathod in a separate thread + with test.Daemon() as d: + # Get a URL for a pathod spec + url = d.p("200:b@100") + # ... and request it + r = requests.put(url) + + # Check the returned data + assert r.status_code == 200 + assert len(r.content) == 100 + + # Check pathod's internal log + log = d.last_log()["request"] + assert log["method"] == "PUT" diff --git a/examples/pathod/test_setup.py b/examples/pathod/test_setup.py new file mode 100644 index 00000000..5dbc456d --- /dev/null +++ b/examples/pathod/test_setup.py @@ -0,0 +1,31 @@ +import requests +from pathod import test + + +class Test: + + """ + Testing the requests module with + a pathod instance started for + each test. + """ + + def setup(self): + self.d = test.Daemon() + + def teardown(self): + self.d.shutdown() + + def test_simple(self): + # Get a URL for a pathod spec + url = self.d.p("200:b@100") + # ... and request it + r = requests.put(url) + + # Check the returned data + assert r.status_code == 200 + assert len(r.content) == 100 + + # Check pathod's internal log + log = self.d.last_log()["request"] + assert log["method"] == "PUT" diff --git a/examples/pathod/test_setupall.py b/examples/pathod/test_setupall.py new file mode 100644 index 00000000..cb84b7b2 --- /dev/null +++ b/examples/pathod/test_setupall.py @@ -0,0 +1,39 @@ +import requests +from pathod import test + + +class Test: + + """ + Testing the requests module with + a single pathod instance started + for the test suite. + """ + @classmethod + def setup_class(cls): + cls.d = test.Daemon() + + @classmethod + def teardown_class(cls): + cls.d.shutdown() + + def setup(self): + # Clear the pathod logs between tests + self.d.clear_log() + + def test_simple(self): + # Get a URL for a pathod spec + url = self.d.p("200:b@100") + # ... and request it + r = requests.put(url) + + # Check the returned data + assert r.status_code == 200 + assert len(r.content) == 100 + + # Check pathod's internal log + log = self.d.last_log()["request"] + assert log["method"] == "PUT" + + def test_two(self): + assert not self.d.log() diff --git a/mitmproxy/bin/mitmdump b/mitmproxy/bin/mitmdump deleted file mode 100644 index 2483be4f..00000000 --- a/mitmproxy/bin/mitmdump +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python -from mitmproxy.main import mitmdump -mitmdump() diff --git a/mitmproxy/bin/mitmproxy b/mitmproxy/bin/mitmproxy deleted file mode 100755 index a3d7615d..00000000 --- a/mitmproxy/bin/mitmproxy +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python -from mitmproxy.main import mitmproxy -mitmproxy() diff --git a/mitmproxy/bin/mitmweb b/mitmproxy/bin/mitmweb deleted file mode 100755 index 14188a33..00000000 --- a/mitmproxy/bin/mitmweb +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env python -from mitmproxy.main import mitmweb - -mitmweb() diff --git a/pathod/bin/pathoc b/pathod/bin/pathoc deleted file mode 100755 index ab62d631..00000000 --- a/pathod/bin/pathoc +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -from pathod import pathoc_cmdline as cmdline - -if __name__ == "__main__": - cmdline.go_pathoc() diff --git a/pathod/bin/pathod b/pathod/bin/pathod deleted file mode 100755 index af0c118b..00000000 --- a/pathod/bin/pathod +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env python - -from pathod import pathod_cmdline as cmdline - -if __name__ == "__main__": - cmdline.go_pathod() diff --git a/pathod/examples/libpathod_pathoc.py b/pathod/examples/libpathod_pathoc.py deleted file mode 100644 index 587c0e4c..00000000 --- a/pathod/examples/libpathod_pathoc.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python -from pathod import pathoc - -p = pathoc.Pathoc(("google.com", 80)) -p.connect() -print p.request("get:/") -print p.request("get:/foo") diff --git a/pathod/examples/test_context.py b/pathod/examples/test_context.py deleted file mode 100644 index 8db4331f..00000000 --- a/pathod/examples/test_context.py +++ /dev/null @@ -1,23 +0,0 @@ -import requests -from pathod import test - - -def test_simple(): - """ - Testing the requests module with - a pathod context manager. - """ - # Start pathod in a separate thread - with test.Daemon() as d: - # Get a URL for a pathod spec - url = d.p("200:b@100") - # ... and request it - r = requests.put(url) - - # Check the returned data - assert r.status_code == 200 - assert len(r.content) == 100 - - # Check pathod's internal log - log = d.last_log()["request"] - assert log["method"] == "PUT" diff --git a/pathod/examples/test_setup.py b/pathod/examples/test_setup.py deleted file mode 100644 index 5dbc456d..00000000 --- a/pathod/examples/test_setup.py +++ /dev/null @@ -1,31 +0,0 @@ -import requests -from pathod import test - - -class Test: - - """ - Testing the requests module with - a pathod instance started for - each test. - """ - - def setup(self): - self.d = test.Daemon() - - def teardown(self): - self.d.shutdown() - - def test_simple(self): - # Get a URL for a pathod spec - url = self.d.p("200:b@100") - # ... and request it - r = requests.put(url) - - # Check the returned data - assert r.status_code == 200 - assert len(r.content) == 100 - - # Check pathod's internal log - log = self.d.last_log()["request"] - assert log["method"] == "PUT" diff --git a/pathod/examples/test_setupall.py b/pathod/examples/test_setupall.py deleted file mode 100644 index cb84b7b2..00000000 --- a/pathod/examples/test_setupall.py +++ /dev/null @@ -1,39 +0,0 @@ -import requests -from pathod import test - - -class Test: - - """ - Testing the requests module with - a single pathod instance started - for the test suite. - """ - @classmethod - def setup_class(cls): - cls.d = test.Daemon() - - @classmethod - def teardown_class(cls): - cls.d.shutdown() - - def setup(self): - # Clear the pathod logs between tests - self.d.clear_log() - - def test_simple(self): - # Get a URL for a pathod spec - url = self.d.p("200:b@100") - # ... and request it - r = requests.put(url) - - # Check the returned data - assert r.status_code == 200 - assert len(r.content) == 100 - - # Check pathod's internal log - log = self.d.last_log()["request"] - assert log["method"] == "PUT" - - def test_two(self): - assert not self.d.log() diff --git a/release/mitmdump.spec b/release/mitmdump.spec index 2e164083..034d6fcc 100644 --- a/release/mitmdump.spec +++ b/release/mitmdump.spec @@ -2,7 +2,7 @@ from PyInstaller.utils.hooks import collect_data_files -a = Analysis(['../mitmproxy/bin/mitmdump'], +a = Analysis(['../bin/mitmdump'], binaries=None, datas=collect_data_files("mitmproxy.onboarding"), hiddenimports=[], diff --git a/release/mitmproxy.spec b/release/mitmproxy.spec index ff42b1f3..08e71f73 100644 --- a/release/mitmproxy.spec +++ b/release/mitmproxy.spec @@ -2,7 +2,7 @@ from PyInstaller.utils.hooks import collect_data_files -a = Analysis(['../mitmproxy/bin/mitmproxy'], +a = Analysis(['../bin/mitmproxy'], binaries=None, datas=collect_data_files("mitmproxy.onboarding"), hiddenimports=[], diff --git a/release/mitmweb.spec b/release/mitmweb.spec index e64940c4..257d3e33 100644 --- a/release/mitmweb.spec +++ b/release/mitmweb.spec @@ -2,7 +2,7 @@ from PyInstaller.utils.hooks import collect_data_files -a = Analysis(['../mitmproxy/bin/mitmweb'], +a = Analysis(['../bin/mitmweb'], binaries=None, datas=collect_data_files("mitmproxy"), hiddenimports=[], diff --git a/release/pathoc.spec b/release/pathoc.spec index e694794e..69c96727 100644 --- a/release/pathoc.spec +++ b/release/pathoc.spec @@ -2,7 +2,7 @@ from PyInstaller.utils.hooks import collect_data_files -a = Analysis(['../pathod/bin/pathoc'], +a = Analysis(['../bin/pathoc'], binaries=None, datas=None, hiddenimports=['_cffi_backend'], diff --git a/release/pathod.spec b/release/pathod.spec index a0ccbaf0..6eabad5e 100644 --- a/release/pathod.spec +++ b/release/pathod.spec @@ -2,7 +2,7 @@ from PyInstaller.utils.hooks import collect_data_files -a = Analysis(['../pathod/bin/pathod'], +a = Analysis(['../bin/pathod'], binaries=None, datas=collect_data_files("pathod"), hiddenimports=['_cffi_backend'], -- cgit v1.2.3