[Pkg-privacy-commits] [obfsproxy] 137/353: Rename project from "pyobfsproxy" to "obfsproxy"!

[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 3b80ce418af9efe22dd8b622bd4ed18b6c50c64e
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Mar 27 17:58:16 2013 -0700

    Rename project from "pyobfsproxy" to "obfsproxy"!
---
 ChangeLog                                    | 1 +
 bin/{pyobfsproxy => obfsproxy}               | 0
 obfsproxy/_version.py                        | 2 +-
 obfsproxy/pyobfsproxy.py                     | 4 ++--
 obfsproxy/test/int_tests/obfsproxy_tester.py | 2 +-
 obfsproxy/test/tester.py                     | 2 +-
 setup.py                                     | 8 ++++----
 setup_py2exe.py                              | 4 ++--
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a070fa7..79a5594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.3 - ??
+ - Rename project from "pyobfsproxy" to "obfsproxy"!
  - Add support for logging exceptions to logfiles.
  - Add shared secret support to obfs2.
  - Add support for per-connection SOCKS arguments.
diff --git a/bin/pyobfsproxy b/bin/obfsproxy
similarity index 100%
rename from bin/pyobfsproxy
rename to bin/obfsproxy
diff --git a/obfsproxy/_version.py b/obfsproxy/_version.py
index bd2cf38..6e7aa55 100644
--- a/obfsproxy/_version.py
+++ b/obfsproxy/_version.py
@@ -180,7 +180,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source, verbose=False)
     return {"version": dirname[len(parentdir_prefix):], "full": ""}
 
 tag_prefix = ""
-parentdir_prefix = "pyobfsproxy-"
+parentdir_prefix = "obfsproxy-"
 versionfile_source = "obfsproxy/_version.py"
 
 def get_versions(default={"version": "unknown", "full": ""}, verbose=False):
diff --git a/obfsproxy/pyobfsproxy.py b/obfsproxy/pyobfsproxy.py
index acde5ed..92663d5 100755
--- a/obfsproxy/pyobfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -30,7 +30,7 @@ def set_up_cli_parsing():
     arguments."""
 
     parser = argparse.ArgumentParser(
-        description='py-obfsproxy: A pluggable transports proxy written in Python')
+        description='Obfsproxy: A pluggable transports proxy written in Python')
     subparsers = parser.add_subparsers(title='supported transports', dest='name')
 
     parser.add_argument('--log-file', help='set logfile')
@@ -109,7 +109,7 @@ def pyobfsproxy():
 
     consider_cli_args(args)
 
-    log.warning('Pyobfsproxy (version: %s) starting up.' % (__version__))
+    log.warning('Obfsproxy (version: %s) starting up.' % (__version__))
 
     log.debug('argv: ' + str(sys.argv))
     log.debug('args: ' + str(args))
diff --git a/obfsproxy/test/int_tests/obfsproxy_tester.py b/obfsproxy/test/int_tests/obfsproxy_tester.py
index 2b44b9e..8c08c1d 100644
--- a/obfsproxy/test/int_tests/obfsproxy_tester.py
+++ b/obfsproxy/test/int_tests/obfsproxy_tester.py
@@ -67,7 +67,7 @@ class Obfsproxy(object):
     def __init__(self, *args, **kwargs):
         # Fix up our argv
         argv = []
-        argv.extend(('python', '../../../../bin/pyobfsproxy', '--log-min-severity=warning'))
+        argv.extend(('python', '../../../../bin/obfsproxy', '--log-min-severity=warning'))
 
         # Extend hardcoded argv with user-specified options.
         if len(args) == 1 and (isinstance(args[0], list) or
diff --git a/obfsproxy/test/tester.py b/obfsproxy/test/tester.py
index 4c6871e..894ba32 100644
--- a/obfsproxy/test/tester.py
+++ b/obfsproxy/test/tester.py
@@ -47,7 +47,7 @@ class Obfsproxy(subprocess.Popen):
     """
     def __init__(self, *args, **kwargs):
         """Spawns obfsproxy with 'args'"""
-        argv = ["bin/pyobfsproxy", "--no-log"]
+        argv = ["bin/obfsproxy", "--no-log"]
         if len(args) == 1 and (isinstance(args[0], list) or
                                isinstance(args[0], tuple)):
             argv.extend(args[0])
diff --git a/setup.py b/setup.py
index 019d0f6..fdbe841 100644
--- a/setup.py
+++ b/setup.py
@@ -7,12 +7,12 @@ from setuptools import setup, find_packages
 import versioneer
 versioneer.versionfile_source = 'obfsproxy/_version.py'
 versioneer.versionfile_build = 'obfsproxy/_version.py'
-versioneer.tag_prefix = 'pyobfsproxy-' # tags are like 1.2.0
-versioneer.parentdir_prefix = 'pyobfsproxy-' # dirname like 'myproject-1.2.0'
+versioneer.tag_prefix = 'obfsproxy-' # tags are like 1.2.0
+versioneer.parentdir_prefix = 'obfsproxy-' # dirname like 'myproject-1.2.0'
 
 
 setup(
-    name = "pyobfsproxy",
+    name = "obfsproxy",
     author = "asn",
     author_email = "asn at torproject.org",
     description = ("A pluggable transport proxy written in Python"),
@@ -25,7 +25,7 @@ setup(
     packages = find_packages(),
     entry_points = {
         'console_scripts': [
-            'pyobfsproxy = obfsproxy.pyobfsproxy:run'
+            'obfsproxy = obfsproxy.pyobfsproxy:run'
             ]
         }
 )
diff --git a/setup_py2exe.py b/setup_py2exe.py
index 2245eaa..76a2360 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -9,8 +9,8 @@ build_path = os.path.join(topdir, "build")
 dist_path = os.path.join(topdir, "dist")
 
 setup(
-    console=["bin/pyobfsproxy"],
-    zipfile="pyobfsproxy.zip",
+    console=["bin/obfsproxy"],
+    zipfile="obfsproxy.zip",
     options={
         "build": {"build_base": build_path},
         "py2exe": {

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