[Pkg-privacy-commits] [obfsproxy] 44/353: Renamed input to conn because the use of input as a variable name is discouraged

[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 71bc6bb46c76df5858c7c6d5830676eae4ee9adc
Author: Brandon Wiley <brandon at blanu.net>
Date:   Wed Aug 29 18:07:08 2012 -0500

    Renamed input to conn because the use of input as a variable name is discouraged
---
 src/obfsproxy/framework/socks.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/obfsproxy/framework/socks.py b/src/obfsproxy/framework/socks.py
index 4f6412f..af1ea9f 100644
--- a/src/obfsproxy/framework/socks.py
+++ b/src/obfsproxy/framework/socks.py
@@ -28,12 +28,12 @@ def uncompact(x):
 
 
 @_o
-def readHandshake(input):
+def readHandshake(conn):
     """ readHandshake reads the SOCKS handshake information to the SOCKS client. """
 
-    version = (yield input.read(1))
+    version = (yield conn.read(1))
     logging.info('version: %s' % encode(str(version)))
-    nauth = (yield input.read(1))
+    nauth = (yield conn.read(1))
     nauth = unpack('B', nauth)[0]
     auths = []
     for x in range(nauth):
@@ -50,14 +50,14 @@ def sendHandshake(output):
 
 
 @_o
-def readRequest(input):
+def readRequest(conn):
     """ readRequest reads the SOCKS request information from the client and returns the bytes represneting the IPv4 destination. """
 
-    version = (yield input.read(1))
-    command = (yield input.read(1))
-    reserved = (yield input.read(1))
-    addrtype = (yield input.read(1))
-    dest = (yield input.read(6))
+    version = (yield conn.read(1))
+    command = (yield conn.read(1))
+    reserved = (yield conn.read(1))
+    addrtype = (yield conn.read(1))
+    dest = (yield conn.read(6))
 
     yield Return(dest)
 

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