--- a/qmsk/net/socket/address.pxd	Sun Aug 23 22:28:07 2009 +0300
+++ b/qmsk/net/socket/address.pxd	Sun Aug 23 22:31:12 2009 +0300
@@ -53,11 +53,12 @@
         
         A full addrinfo struct is stored, but ai_canonname and ai_addr are stored as (optional) objects outside of the
         addrinfo struct.
-
+        
+        >>> from qmsk.net.socket import af_inet
         >>> ai = addrinfo()
         >>> ai.addr
         >>> ai.canonname
-        >>> print addrinfo(addr=sockaddr_in())
+        >>> print addrinfo(addr=af_inet.sockaddr_in())
         family=0, socktype=0, protocol=0, addr=0.0.0.0:0, canonname=None
     """
     
@@ -108,7 +109,7 @@
     """
     
     # our defining attributes, set via __init__
-    cdef object hostname, service
+    cdef public object hostname, service
 
     cpdef getaddrinfo (self, int family, int socktype, int protocol = ?, int flags = ?)
 

--- a/qmsk/net/socket/socket.pxd	Sun Aug 23 22:28:07 2009 +0300
+++ b/qmsk/net/socket/socket.pxd	Sun Aug 23 22:31:12 2009 +0300
@@ -8,7 +8,7 @@
     """
         Represents a single OS-level socket
         
-        >>> from qmsk.net.socket import address as addr
+        >>> from qmsk.net.socket import af_inet
         >>> from qmsk.net.socket.constants import *
 
         >>> s = socket(1337)
@@ -23,12 +23,12 @@
         OSError: [Errno 9] Bad file descriptor
 
         >>> s = socket(AF_INET, SOCK_STREAM)
-        >>> s.bind(addr.sockaddr_in('127.0.0.1', 1337))
+        >>> s.bind(af_inet.sockaddr_in('127.0.0.1', 1337))
         >>> s.listen(1)
         >>> s.listen(0)
 
         >>> s = socket()
-        >>> s.connect(addr.sockaddr_in('127.0.0.1', 1338))
+        >>> s.connect(af_inet.sockaddr_in('127.0.0.1', 1338))
         Traceback (most recent call last):
           ...
         OSError: [Errno 111] Connection refused

--- a/test.py	Sun Aug 23 22:28:07 2009 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-import doctest
-
-import qmsk.net.socket.address
-import qmsk.net.socket.socket
-import qmsk.net.sctp.sock
-
-for mod in (
-    qmsk.net.socket.address,
-    qmsk.net.socket.socket,
-    qmsk.net.sctp.sock,
-) :
-    doctest.testmod(mod)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/run-doctests.py	Sun Aug 23 22:31:12 2009 +0300
@@ -0,0 +1,12 @@
+import doctest
+
+import qmsk.net.socket.address
+import qmsk.net.socket.socket
+import qmsk.net.socket.sctp
+
+for mod in (
+    qmsk.net.socket.address,
+    qmsk.net.socket.socket,
+    qmsk.net.socket.sctp,
+) :
+    doctest.testmod(mod)