[Pkg-privacy-commits] [obfsproxy] 14/353: Renamed obfsproxy.py to cli.py to avoid name collision with obfsproxy module

[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 f6ba1f9a80ca01bce443b4307e05f35e85da78be
Author: Brandon Wiley <brandon at blanu.net>
Date:   Wed Jul 4 14:04:24 2012 -0500

    Renamed obfsproxy.py to cli.py to avoid name collision with obfsproxy module
---
 src/{obfsproxy/cli/obfsproxy.py => cli.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/obfsproxy/cli/obfsproxy.py b/src/cli.py
similarity index 93%
copy from src/obfsproxy/cli/obfsproxy.py
copy to src/cli.py
index f219a99..3335ae6 100644
--- a/src/obfsproxy/cli/obfsproxy.py
+++ b/src/cli.py
@@ -3,8 +3,8 @@
 
 import argparse
 
-from pyptlib.framework.server import ManagedServer
-from pyptlib.framework.client import ManagedClient
+from obfsproxy.framework.managed.server import ManagedServer
+from obfsproxy.framework.managed.client import ManagedClient
 
 protocols = ['dummy', 'rot13']
 

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