[Jython-checkins] jython (2.5): Fixing a syntax error hat somehow never caused an error

[alan.kennedy]

http://hg.python.org/jython/rev/1a672388105b
changeset:   7050:1a672388105b
branch:      2.5
parent:      7030:fa5bcc1c80cb
user:        Alan Kennedy <alan at xhaus.com>
date:        Fri Feb 15 21:34:43 2013 +0000
summary:
  Fixing a syntax error hat somehow never caused an error

files:
  Lib/socket.py |  2 +-
  NEWS          |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/socket.py b/Lib/socket.py
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -308,7 +308,7 @@
     'htonl', 'ntohs', 'ntohl', 'inet_pton', 'inet_ntop', 'inet_aton',
     'inet_ntoa', 'create_connection', 'socket', 'ssl',
     # exceptions
-    'error', 'herror', 'gaierror', 'timeout', 'sslerror,
+    'error', 'herror', 'gaierror', 'timeout', 'sslerror',
     # classes
     'SocketType', 
     # Misc flags     
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Jython 2.5.4rc2
   Bugs Fixed
+    - [ 1753 ] zlib doesn't call end() on compress and decompress
     - [ 1971 ] platform.py - 'NoneType' object has no attribute 'groups'
     - [ 1988 ] API for threading.condition fails to accept *args for acquire
 

-- 
Repository URL: http://hg.python.org/jython