[Pkg-privacy-commits] [obfsproxy] 103/353: Change directory structure a bit.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository obfsproxy.

commit 04f25012ce33f4b3a41446669ae0d0f3dd049cf2
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sat Jan 26 14:10:51 2013 +0200

    Change directory structure a bit.
    
    The new directory structure will make pyobfsproxy easier to package
    and deploy.
---
 bin/pyobfsproxy                          | 10 ++++++++++
 obfsproxy.py => obfsproxy/pyobfsproxy.py |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bin/pyobfsproxy b/bin/pyobfsproxy
new file mode 100755
index 0000000..cb9d94c
--- /dev/null
+++ b/bin/pyobfsproxy
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import sys, os
+
+sys.path.insert(0, os.path.abspath(os.getcwd()))
+
+from obfsproxy.pyobfsproxy import run
+run()
+
+
diff --git a/obfsproxy.py b/obfsproxy/pyobfsproxy.py
similarity index 99%
rename from obfsproxy.py
rename to obfsproxy/pyobfsproxy.py
index db0d873..7f23554 100755
--- a/obfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -101,7 +101,7 @@ def consider_cli_args(args):
         # managed proxies without a logfile must not log at all.
         log.disable_logs()
 
-def main(argv):
+def run():
     parser = set_up_cli_parsing()
 
     args = parser.parse_args()
@@ -131,4 +131,4 @@ def main(argv):
         do_external_mode(args)
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    run()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git