[pypy-svn] r76169 - in pypy/branch/fast-forward/pypy/module/_ssl: . test

[benjamin at codespeak.net]

Author: benjamin
Date: Tue Jul 13 01:01:35 2010
New Revision: 76169

Modified:
   pypy/branch/fast-forward/pypy/module/_ssl/__init__.py
   pypy/branch/fast-forward/pypy/module/_ssl/app_ssl.py
   pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py
   pypy/branch/fast-forward/pypy/module/_ssl/test/test_ssl.py
Log:
sslerror is now nicely named

Modified: pypy/branch/fast-forward/pypy/module/_ssl/__init__.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_ssl/__init__.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_ssl/__init__.py	Tue Jul 13 01:01:35 2010
@@ -7,7 +7,7 @@
 
     appleveldefs = {
         '__doc__': 'app_ssl.__doc__',
-        'sslerror': 'app_ssl.sslerror',
+        'SSLError': 'app_ssl.SSLError',
     }
 
     @classmethod

Modified: pypy/branch/fast-forward/pypy/module/_ssl/app_ssl.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_ssl/app_ssl.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_ssl/app_ssl.py	Tue Jul 13 01:01:35 2010
@@ -1,4 +1,4 @@
-class sslerror(Exception):
+class SSLError(Exception):
     pass
 
 __doc__ = """Implementation module for SSL socket operations. 

Modified: pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_ssl/interp_ssl.py	Tue Jul 13 01:01:35 2010
@@ -155,7 +155,7 @@
 
 def ssl_error(space, msg):
     w_module = space.getbuiltinmodule('_ssl')
-    w_exception = space.getattr(w_module, space.wrap('sslerror'))
+    w_exception = space.getattr(w_module, space.wrap('SSLError'))
     return OperationError(w_exception, space.wrap(msg))
 
 def _init_ssl():

Modified: pypy/branch/fast-forward/pypy/module/_ssl/test/test_ssl.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/_ssl/test/test_ssl.py	(original)
+++ pypy/branch/fast-forward/pypy/module/_ssl/test/test_ssl.py	Tue Jul 13 01:01:35 2010
@@ -12,7 +12,7 @@
     
     def test_sslerror(self):
         import _ssl
-        assert issubclass(_ssl.sslerror, Exception)
+        assert issubclass(_ssl.SSLError, Exception)
 
     def test_constants(self):
         import _ssl