[pypy-svn] r26331 - in pypy/dist/pypy: module/_socket translator/c

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Apr 25 14:23:59 2006
New Revision: 26331

Added:
   pypy/dist/pypy/module/_socket/conftest.py
      - copied unchanged from r26303, pypy/dist/pypy/rpython/rctypes/test/conftest.py
Modified:
   pypy/dist/pypy/module/_socket/__init__.py
   pypy/dist/pypy/translator/c/extfunc.py
Log:
remove direct import of ctypes to be able to properly skip tests if it is not
there


Modified: pypy/dist/pypy/module/_socket/__init__.py
==============================================================================
--- pypy/dist/pypy/module/_socket/__init__.py	(original)
+++ pypy/dist/pypy/module/_socket/__init__.py	Tue Apr 25 14:23:59 2006
@@ -1,6 +1,5 @@
 # Package initialisation
 from pypy.interpreter.mixedmodule import MixedModule
-from pypy.rpython.rctypes.socketmodule import ctypes_socket as _c 
 import sys
 
 class Module(MixedModule):
@@ -17,18 +16,21 @@
         'socket'    :  'interp_socket.getsockettype(space)',
     }
 
-for name in """
-    gethostbyname_ex gethostbyaddr gethostname
-    getservbyname getservbyport getprotobyname
-    fromfd socketpair
-    ntohs ntohl htons htonl inet_aton inet_ntoa inet_pton inet_ntop
-    getaddrinfo getnameinfo
-    getdefaulttimeout setdefaulttimeout 
-    """.split():
-    
-    Module.interpleveldefs[name] = 'interp_socket.%s' % (name, )
+    def buildloaders(cls):
+        from pypy.rpython.rctypes.socketmodule import ctypes_socket as _c 
+        for name in """
+            gethostbyname_ex gethostbyaddr gethostname
+            getservbyname getservbyport getprotobyname
+            fromfd socketpair
+            ntohs ntohl htons htonl inet_aton inet_ntoa inet_pton inet_ntop
+            getaddrinfo getnameinfo
+            getdefaulttimeout setdefaulttimeout 
+            """.split():
+            
+            Module.interpleveldefs[name] = 'interp_socket.%s' % (name, )
 
-for constant, value in _c.constants.iteritems():
-    Module.interpleveldefs[constant] = "space.wrap(%r)" % value
+        for constant, value in _c.constants.iteritems():
+            Module.interpleveldefs[constant] = "space.wrap(%r)" % value
+    buildloaders = classmethod(buildloaders)
 
 #Module.interpleveldefs['has_ipv6'] = "space.wrap(%s)" % _socket.has_ipv6

Modified: pypy/dist/pypy/translator/c/extfunc.py
==============================================================================
--- pypy/dist/pypy/translator/c/extfunc.py	(original)
+++ pypy/dist/pypy/translator/c/extfunc.py	Tue Apr 25 14:23:59 2006
@@ -8,7 +8,6 @@
 from pypy.rpython.module import ll_os, ll_time, ll_math, ll_strtod
 from pypy.rpython.module import ll_stackless, ll_stack
 from pypy.module.thread.rpython import ll_thread
-from pypy.module._socket.rpython import ll__socket
 
 # table of functions hand-written in src/ll_*.h
 EXTERNALS = {
@@ -59,18 +58,6 @@
     ll_stackless.ll_stackless_stack_frames_depth: 'LL_stackless_stack_frames_depth',
     ll_stack.ll_stack_unwind: 'LL_stack_unwind',
     ll_stack.ll_stack_too_big: 'LL_stack_too_big',
-    ll__socket.ll__socket_gethostname:   'LL__socket_gethostname',
-    ll__socket.ll__socket_gethostbyname: 'LL__socket_gethostbyname',
-    ll__socket.ll__socket_getaddrinfo:   'LL__socket_getaddrinfo',
-    ll__socket.ll__socket_nextaddrinfo:  'LL__socket_nextaddrinfo',
-    ll__socket.ll__socket_freeaddrinfo:  'LL__socket_freeaddrinfo',
-    ll__socket.ll__socket_ntohs: 'LL__socket_ntohs',
-    ll__socket.ll__socket_htons: 'LL__socket_htons',
-    ll__socket.ll__socket_htonl: 'LL__socket_htonl',
-    ll__socket.ll__socket_ntohl: 'LL__socket_htonl',
-    ll__socket.ll__socket_newsocket: 'LL__socket_newsocket',
-    ll__socket.ll__socket_connect: 'LL__socket_connect',
-    ll__socket.ll__socket_getpeername: 'LL__socket_getpeername',
     }
 
 #______________________________________________________
@@ -101,8 +88,6 @@
     yield ('RPyFREXP_RESULT', ll_math.FREXP_RESULT)
     yield ('RPyMODF_RESULT', ll_math.MODF_RESULT)
     yield ('RPySTAT_RESULT', ll_os.STAT_RESULT)
-    yield ('RPySOCKET_ADDRINFO', ll__socket.ADDRINFO_RESULT)
-    yield ('RPySOCKET_SOCKNAME', ll__socket.SOCKNAME)
 
 def predeclare_utility_functions(db, rtyper, optimize=True):
     # Common utility functions
@@ -164,17 +149,6 @@
         not optimize):
         r.append(annotate(ll_os.ll_stat_result, *([lltype.Signed] * 10)))
 
-    if (ll__socket.ll__socket_nextaddrinfo in db.externalfuncs or
-        not optimize):
-        args = [lltype.Signed, lltype.Signed, lltype.Signed, lltype.Ptr(STR),
-                lltype.Ptr(STR), lltype.Signed, lltype.Signed, lltype.Signed]
-        r.append(annotate(ll__socket.ll__socket_addrinfo, *args))
-        
-    if (ll__socket.ll__socket_getpeername in db.externalfuncs or
-        not optimize):
-        args = [lltype.Ptr(STR), lltype.Signed, lltype.Signed, lltype.Signed]
-        r.append(annotate(ll__socket.ll__socket_sockname, *args))
-
     return r
 
 def predeclare_extfunc_helpers(db, rtyper, optimize=True):
@@ -195,16 +169,6 @@
         yield decl(ll_os.ll_stat_result)
         yield ('LL_NEED_OS_STAT', 1)
 
-    if (ll__socket.ll__socket_nextaddrinfo in db.externalfuncs or
-        not optimize):
-        yield decl(ll__socket.ll__socket_addrinfo)
-        yield ('LL_NEED__SOCKET_ADDRINFO', 1)
-        
-    if (ll__socket.ll__socket_getpeername in db.externalfuncs or
-        not optimize):
-        yield decl(ll__socket.ll__socket_sockname)
-        yield ('LL_NEED__SOCKET_SOCKNAME', 1)
-
 def predeclare_extfuncs(db, rtyper, optimize=True):
     modules = {}
     def module_name(c_name):