[Pkg-privacy-commits] [obfsproxy] 68/353: Move project to a different directory structure.
Ximin Luo
infinity0 at moszumanska.debian.org
Sat Aug 22 13:01:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository obfsproxy.
commit 69974c52d968b3a3be80532c7cef02285446b295
Author: George Kadianakis <desnacked at riseup.net>
Date: Mon Sep 17 18:08:46 2012 +0300
Move project to a different directory structure.
This commit only moves code, it does not modify anything.
---
src/cli.py => obfsproxy.py | 1 +
obfsproxy/__init__.py | 0
obfsproxy/common/__init__.py | 0
{src/obfsproxy/crypto => obfsproxy/common}/aes.py | 0
{src/obfsproxy => obfsproxy}/common/log.py | 0
obfsproxy/managed/__init__.py | 0
.../framework => obfsproxy}/managed/client.py | 0
.../framework => obfsproxy}/managed/server.py | 0
obfsproxy/network/__init__.py | 0
.../framework => obfsproxy/network}/network.py | 0
.../framework => obfsproxy/network}/socks.py | 0
obfsproxy/test/__init__.py | 0
tester.py => obfsproxy/test/tester.py | 0
obfsproxy/transports/__init__.py | 0
{src/obfsproxy => obfsproxy}/transports/b64.py | 0
{src/obfsproxy => obfsproxy}/transports/base.py | 20 --------------------
{src/obfsproxy => obfsproxy}/transports/dummy.py | 0
.../transports/dust_transport.py | 0
{src/obfsproxy => obfsproxy}/transports/obfs2.py | 0
{src/obfsproxy => obfsproxy}/transports/obfs3.py | 0
obfsproxy/transports/transports.py | 19 +++++++++++++++++++
src/obfsproxy/__init__.py | 3 ---
src/obfsproxy/common/__init__.py | 2 --
src/obfsproxy/crypto/__init__.py | 3 ---
src/obfsproxy/framework/__init__.py | 3 ---
src/obfsproxy/framework/managed/__init__.py | 3 ---
src/obfsproxy/manager/__init__.py | 3 ---
src/obfsproxy/transports/__init__.py | 3 ---
{src => tools/manager}/__init__.py | 0
{src/obfsproxy => tools}/manager/clientManager.py | 0
{src/obfsproxy => tools}/manager/manager.py | 0
{src/obfsproxy => tools}/manager/serverManager.py | 0
32 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/src/cli.py b/obfsproxy.py
old mode 100755
new mode 100644
similarity index 99%
rename from src/cli.py
rename to obfsproxy.py
index 17367e7..1387acf
--- a/src/cli.py
+++ b/obfsproxy.py
@@ -10,6 +10,7 @@ Currently, not all of the obfsproxy command line options have been implemented.
import os
import sys
import argparse
+print sys.path
import obfsproxy.transports.base as base
import obfsproxy.common.log as log
diff --git a/obfsproxy/__init__.py b/obfsproxy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/obfsproxy/common/__init__.py b/obfsproxy/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/obfsproxy/crypto/aes.py b/obfsproxy/common/aes.py
similarity index 100%
rename from src/obfsproxy/crypto/aes.py
rename to obfsproxy/common/aes.py
diff --git a/src/obfsproxy/common/log.py b/obfsproxy/common/log.py
similarity index 100%
rename from src/obfsproxy/common/log.py
rename to obfsproxy/common/log.py
diff --git a/obfsproxy/managed/__init__.py b/obfsproxy/managed/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/obfsproxy/framework/managed/client.py b/obfsproxy/managed/client.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/obfsproxy/framework/managed/client.py
rename to obfsproxy/managed/client.py
diff --git a/src/obfsproxy/framework/managed/server.py b/obfsproxy/managed/server.py
old mode 100755
new mode 100644
similarity index 100%
rename from src/obfsproxy/framework/managed/server.py
rename to obfsproxy/managed/server.py
diff --git a/obfsproxy/network/__init__.py b/obfsproxy/network/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/obfsproxy/framework/network.py b/obfsproxy/network/network.py
similarity index 100%
rename from src/obfsproxy/framework/network.py
rename to obfsproxy/network/network.py
diff --git a/src/obfsproxy/framework/socks.py b/obfsproxy/network/socks.py
similarity index 100%
rename from src/obfsproxy/framework/socks.py
rename to obfsproxy/network/socks.py
diff --git a/obfsproxy/test/__init__.py b/obfsproxy/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tester.py b/obfsproxy/test/tester.py
similarity index 100%
rename from tester.py
rename to obfsproxy/test/tester.py
diff --git a/obfsproxy/transports/__init__.py b/obfsproxy/transports/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/obfsproxy/transports/b64.py b/obfsproxy/transports/b64.py
similarity index 100%
rename from src/obfsproxy/transports/b64.py
rename to obfsproxy/transports/b64.py
diff --git a/src/obfsproxy/transports/base.py b/obfsproxy/transports/base.py
similarity index 79%
rename from src/obfsproxy/transports/base.py
rename to obfsproxy/transports/base.py
index 4272645..040d2f3 100644
--- a/src/obfsproxy/transports/base.py
+++ b/obfsproxy/transports/base.py
@@ -130,23 +130,3 @@ class BaseDaemon:
"""
pass
-
-# XXX modulify transports and move this to a single import
-import obfsproxy.transports.dummy as dummy
-import obfsproxy.transports.b64 as b64
-import obfsproxy.transports.dust_transport as dust
-# XXX obfs2 is broken...
-#import obfsproxy.transports.obfs2 as obfs2
-import obfsproxy.transports.obfs3 as obfs3
-
-transports = { 'dummy' : {'client' : dummy.DummyClient, 'socks' : dummy.DummyClient, 'server' : dummy.DummyServer },
- 'b64' : {'client' : b64.B64Client, 'socks' : b64.B64Client, 'server' : b64.B64Server },
- 'dust' : {'client' : dust.DustClient, 'socks' : dust.DustClient, 'server' : dust.DustServer },
-# 'obfs2' : {'client' : obfs2.Obfs2Client, 'socks' : obfs2.Obfs2Client, 'server' : obfs2.Obfs2Server },
- 'obfs3' : {'client' : obfs3.Obfs3Client, 'socks' : obfs3.Obfs3Client, 'server' : obfs3.Obfs3Server } }
-
-def get_transport_class_from_name_and_mode(name, mode):
- if (name in transports) and (mode in transports[name]):
- return transports[name][mode]
- else:
- return None
diff --git a/src/obfsproxy/transports/dummy.py b/obfsproxy/transports/dummy.py
similarity index 100%
rename from src/obfsproxy/transports/dummy.py
rename to obfsproxy/transports/dummy.py
diff --git a/src/obfsproxy/transports/dust_transport.py b/obfsproxy/transports/dust_transport.py
similarity index 100%
rename from src/obfsproxy/transports/dust_transport.py
rename to obfsproxy/transports/dust_transport.py
diff --git a/src/obfsproxy/transports/obfs2.py b/obfsproxy/transports/obfs2.py
similarity index 100%
rename from src/obfsproxy/transports/obfs2.py
rename to obfsproxy/transports/obfs2.py
diff --git a/src/obfsproxy/transports/obfs3.py b/obfsproxy/transports/obfs3.py
similarity index 100%
rename from src/obfsproxy/transports/obfs3.py
rename to obfsproxy/transports/obfs3.py
diff --git a/obfsproxy/transports/transports.py b/obfsproxy/transports/transports.py
new file mode 100644
index 0000000..7229f6b
--- /dev/null
+++ b/obfsproxy/transports/transports.py
@@ -0,0 +1,19 @@
+# XXX modulify transports and move this to a single import
+import obfsproxy.transports.dummy as dummy
+import obfsproxy.transports.b64 as b64
+import obfsproxy.transports.dust_transport as dust
+# XXX obfs2 is broken...
+#import obfsproxy.transports.obfs2 as obfs2
+#import obfsproxy.transports.obfs3 as obfs3
+
+transports = { 'dummy' : {'client' : dummy.DummyClient, 'socks' : dummy.DummyClient, 'server' : dummy.DummyServer },
+ 'b64' : {'client' : b64.B64Client, 'socks' : b64.B64Client, 'server' : b64.B64Server },
+ 'dust' : {'client' : dust.DustClient, 'socks' : dust.DustClient, 'server' : dust.DustServer } }
+# 'obfs2' : {'client' : obfs2.Obfs2Client, 'socks' : obfs2.Obfs2Client, 'server' : obfs2.Obfs2Server },
+# 'obfs3' : {'client' : obfs3.Obfs3Client, 'socks' : obfs3.Obfs3Client, 'server' : obfs3.Obfs3Server }
+
+def get_transport_class_from_name_and_mode(name, mode):
+ if (name in transports) and (mode in transports[name]):
+ return transports[name][mode]
+ else:
+ return None
diff --git a/src/obfsproxy/__init__.py b/src/obfsproxy/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/obfsproxy/common/__init__.py b/src/obfsproxy/common/__init__.py
deleted file mode 100644
index 836e3e8..0000000
--- a/src/obfsproxy/common/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
diff --git a/src/obfsproxy/crypto/__init__.py b/src/obfsproxy/crypto/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/crypto/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/obfsproxy/framework/__init__.py b/src/obfsproxy/framework/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/framework/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/obfsproxy/framework/managed/__init__.py b/src/obfsproxy/framework/managed/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/framework/managed/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/obfsproxy/manager/__init__.py b/src/obfsproxy/manager/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/manager/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/obfsproxy/transports/__init__.py b/src/obfsproxy/transports/__init__.py
deleted file mode 100644
index e0e3e1a..0000000
--- a/src/obfsproxy/transports/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
diff --git a/src/__init__.py b/tools/manager/__init__.py
similarity index 100%
rename from src/__init__.py
rename to tools/manager/__init__.py
diff --git a/src/obfsproxy/manager/clientManager.py b/tools/manager/clientManager.py
similarity index 100%
rename from src/obfsproxy/manager/clientManager.py
rename to tools/manager/clientManager.py
diff --git a/src/obfsproxy/manager/manager.py b/tools/manager/manager.py
similarity index 100%
rename from src/obfsproxy/manager/manager.py
rename to tools/manager/manager.py
diff --git a/src/obfsproxy/manager/serverManager.py b/tools/manager/serverManager.py
similarity index 100%
rename from src/obfsproxy/manager/serverManager.py
rename to tools/manager/serverManager.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/obfsproxy.git
More information about the Pkg-privacy-commits
mailing list