move libc+py back to qmsk.net.x
authorTero Marttila <terom@fixme.fi>
Sun, 16 Aug 2009 20:22:06 +0300
changeset 11 7ae92c2b433f
parent 10 94b0d5a208c1
child 12 314d47bdd4d9
move libc+py back to qmsk.net.x
inc/libc.pxd
inc/py.pxd
inc/qmsk.net.libc.pxd
inc/qmsk.net.py.pxd
libc.so
py.so
qmsk/net/libc.pyx
qmsk/net/py.pxd
qmsk/net/py.pyx
qmsk/net/sctp/sock.pxd
qmsk/net/sctp/sock.pyx
qmsk/net/socket/addr.pxd
qmsk/net/socket/addr.pyx
qmsk/net/socket/platform.pxd
qmsk/net/socket/platform.pyx
qmsk/net/socket/socket.pyx
--- a/inc/libc.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../qmsk/net/libc.pxd
\ No newline at end of file
--- a/inc/py.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../qmsk/net/py.pxd
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/qmsk.net.libc.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -0,0 +1,1 @@
+../qmsk/net/libc.pxd
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inc/qmsk.net.py.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -0,0 +1,1 @@
+../qmsk/net/py.pxd
\ No newline at end of file
--- a/libc.so	Sun Aug 16 20:18:39 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-qmsk/net/libc.so
\ No newline at end of file
--- a/py.so	Sun Aug 16 20:18:39 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-qmsk/net/py.so
\ No newline at end of file
--- a/qmsk/net/libc.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/libc.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -1,5 +1,5 @@
-from libc cimport *
-from py cimport raise_errno
+from qmsk.net.libc cimport *
+from qmsk.net.py cimport raise_errno
 
 #cdef class Errno (py.OSError) :
 #    def __init__ (self, func) :
--- a/qmsk/net/py.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/py.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -1,4 +1,4 @@
-cimport libc
+cimport qmsk.net.libc as libc
 
 cdef extern from "Python.h" :
     struct PyObject :
--- a/qmsk/net/py.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/py.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -1,4 +1,4 @@
-from py cimport *
+from qmsk.net.py cimport *
 
 cdef int raise_errno (char *func) except -1 :
     PyErr_SetFromErrno(PyExc_OSError)
--- a/qmsk/net/sctp/sock.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/sctp/sock.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -1,6 +1,4 @@
-cimport libc
-
-from libc cimport __u8, __u16, __u32, __s8, __s16, __s32
+from qmsk.net.libc cimport __u8, __u16, __u32, __s8, __s16, __s32
 
 cimport qmsk.net.socket.platform as platform
 
--- a/qmsk/net/sctp/sock.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/sctp/sock.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -13,8 +13,8 @@
 from qmsk.net.socket.addr cimport sockaddr
 from qmsk.net.socket cimport platform
 
-cimport libc
-from py cimport raise_errno
+cimport qmsk.net.libc as libc
+from qmsk.net.py cimport raise_errno
 
 cdef size_t addrsoup_len (object addrs) except -1 :
     """
--- a/qmsk/net/socket/addr.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/socket/addr.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -6,7 +6,7 @@
         endpoint    - human-readable network address, corresponding to multiple sockaddr's
 """
 
-cimport libc
+cimport qmsk.net.libc as libc
 
 cimport qmsk.net.socket.platform as platform
 
--- a/qmsk/net/socket/addr.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/socket/addr.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -1,4 +1,4 @@
-cimport libc
+cimport qmsk.net.libc as libc
 
 from qmsk.net.socket.addr cimport *
 
--- a/qmsk/net/socket/platform.pxd	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/socket/platform.pxd	Sun Aug 16 20:22:06 2009 +0300
@@ -2,7 +2,7 @@
     Platform definitions for... 64-bit linux. They're all the same, right?
 """
 
-from libc cimport *
+from qmsk.net.libc cimport *
 
 cdef extern from "arpa/inet.h" :
     # XXX: correct?!
--- a/qmsk/net/socket/platform.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/socket/platform.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -1,7 +1,7 @@
 
 from qmsk.net.socket.platform cimport *
 
-from py cimport raise_errno
+from qmsk.net.py cimport raise_errno
 
 ## function wrappers
 cdef object inet_ntop (int af, void *sockaddr) :
--- a/qmsk/net/socket/socket.pyx	Sun Aug 16 20:18:39 2009 +0300
+++ b/qmsk/net/socket/socket.pyx	Sun Aug 16 20:22:06 2009 +0300
@@ -2,9 +2,9 @@
 from qmsk.net.socket.addr cimport sockaddr, build_sockaddr
 cimport qmsk.net.socket.platform as platform
 
-cimport libc, py
+cimport qmsk.net.libc as libc, qmsk.net.py as py
 
-from py cimport raise_errno
+from qmsk.net.py cimport raise_errno
 
 # XXX: do some GIL-releasin'
 cdef class socket :