[pypy-svn] r34764 - in pypy/dist/pypy/lib: . distributed test2

[fijal at codespeak.net]

Author: fijal
Date: Sun Nov 19 18:11:32 2006
New Revision: 34764

Added:
   pypy/dist/pypy/lib/distributed/   (props changed)
   pypy/dist/pypy/lib/distributed/__init__.py   (contents, props changed)
   pypy/dist/pypy/lib/distributed/protocol.py
      - copied unchanged from r34690, pypy/dist/pypy/lib/distributed.py
Removed:
   pypy/dist/pypy/lib/distributed.py
Modified:
   pypy/dist/pypy/lib/test2/test_distributed.py
Log:
Moved distributed to it's own directory. More refactoring planned.


Added: pypy/dist/pypy/lib/distributed/__init__.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/lib/distributed/__init__.py	Sun Nov 19 18:11:32 2006
@@ -0,0 +1,2 @@
+
+from protocol import RemoteProtocol, test_env

Modified: pypy/dist/pypy/lib/test2/test_distributed.py
==============================================================================
--- pypy/dist/pypy/lib/test2/test_distributed.py	(original)
+++ pypy/dist/pypy/lib/test2/test_distributed.py	Sun Nov 19 18:11:32 2006
@@ -16,10 +16,9 @@
 
     def test_init(self):
         import distributed
-        distributed.proxy
 
     def test_protocol(self):
-        from distributed import AbstractProtocol
+        from distributed.protocol import AbstractProtocol
         protocol = AbstractProtocol()
         for item in ("aaa", 3, u"aa", 344444444444444444L, 1.2, (1, "aa")):
             assert protocol.unwrap(protocol.wrap(item)) == item
@@ -33,7 +32,7 @@
 
     def test_protocol_run(self):
         l = [1,2,3]
-        from distributed import LocalProtocol
+        from distributed.protocol import LocalProtocol
         protocol = LocalProtocol()
         wrap = protocol.wrap
         unwrap = protocol.unwrap
@@ -47,7 +46,7 @@
         def f(x, y):
             return x + y
         
-        from distributed import LocalProtocol
+        from distributed.protocol import LocalProtocol
         protocol = LocalProtocol()
         wrap = protocol.wrap
         unwrap = protocol.unwrap
@@ -99,7 +98,7 @@
             def __len__(self):
                 return self.x + 8
         
-        from distributed import LocalProtocol
+        from distributed.protocol import LocalProtocol
         protocol = LocalProtocol()
         wrap = protocol.wrap
         unwrap = protocol.unwrap