[pypy-svn] r34233 - in pypy/dist/pypy: module/rsocket module/rsocket/test rlib rlib/test

[ac at codespeak.net]

Author: ac
Date: Sun Nov  5 13:27:39 2006
New Revision: 34233

Added:
   pypy/dist/pypy/rlib/_rsocket_ctypes.py
      - copied unchanged from r34232, pypy/dist/pypy/module/rsocket/ctypes_socket.py
   pypy/dist/pypy/rlib/rsocket.py
      - copied, changed from r34232, pypy/dist/pypy/module/rsocket/rsocket.py
   pypy/dist/pypy/rlib/test/test_rsocket.py
      - copied, changed from r34144, pypy/dist/pypy/module/rsocket/test/test_rsocket.py
Removed:
   pypy/dist/pypy/module/rsocket/ctypes_socket.py
   pypy/dist/pypy/module/rsocket/rsocket.py
   pypy/dist/pypy/module/rsocket/test/test_rsocket.py
Modified:
   pypy/dist/pypy/module/rsocket/__init__.py
   pypy/dist/pypy/module/rsocket/interp_func.py
   pypy/dist/pypy/module/rsocket/interp_socket.py
Log:
Move rsocket into rlib.

Modified: pypy/dist/pypy/module/rsocket/__init__.py
==============================================================================
--- pypy/dist/pypy/module/rsocket/__init__.py	(original)
+++ pypy/dist/pypy/module/rsocket/__init__.py	Sun Nov  5 13:27:39 2006
@@ -18,7 +18,7 @@
     }
 
     def buildloaders(cls):
-        from pypy.module.rsocket import rsocket
+        from pypy.rlib import rsocket
         for name in """
             gethostbyname gethostbyname_ex gethostbyaddr gethostname
             getservbyname getservbyport getprotobyname

Modified: pypy/dist/pypy/module/rsocket/interp_func.py
==============================================================================
--- pypy/dist/pypy/module/rsocket/interp_func.py	(original)
+++ pypy/dist/pypy/module/rsocket/interp_func.py	Sun Nov  5 13:27:39 2006
@@ -1,7 +1,7 @@
 from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped
 from pypy.module.rsocket.interp_socket import converted_error, W_RSocket
-from pypy.module.rsocket import rsocket
-from pypy.module.rsocket.rsocket import SocketError
+from pypy.rlib import rsocket
+from pypy.rlib.rsocket import SocketError
 from pypy.interpreter.error import OperationError
 
 def gethostname(space):

Modified: pypy/dist/pypy/module/rsocket/interp_socket.py
==============================================================================
--- pypy/dist/pypy/module/rsocket/interp_socket.py	(original)
+++ pypy/dist/pypy/module/rsocket/interp_socket.py	Sun Nov  5 13:27:39 2006
@@ -2,8 +2,8 @@
 from pypy.interpreter.typedef import TypeDef
 from pypy.interpreter.gateway import ObjSpace, W_Root, NoneNotWrapped
 from pypy.interpreter.gateway import interp2app
-from pypy.module.rsocket.rsocket import RSocket, AF_INET, SOCK_STREAM
-from pypy.module.rsocket.rsocket import SocketError, SocketErrorWithErrno
+from pypy.rlib.rsocket import RSocket, AF_INET, SOCK_STREAM
+from pypy.rlib.rsocket import SocketError, SocketErrorWithErrno
 from pypy.interpreter.error import OperationError
 from pypy.interpreter import gateway