SF.net SVN: fclient: [257] trunk/sandbox/fcp2

[<ju...@us...>]

Revision: 257
          http://fclient.svn.sourceforge.net/fclient/?rev=257&view=rev
Author:   jurner
Date:     2008-02-26 02:01:29 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
adjusted package imports

Modified Paths:
--------------
    trunk/sandbox/fcp2/client.py
    trunk/sandbox/fcp2/config.py
    trunk/sandbox/fcp2/events.py
    trunk/sandbox/fcp2/message.py
    trunk/sandbox/fcp2/params.py
    trunk/sandbox/fcp2/scripts/gen_docs.py
    trunk/sandbox/fcp2/scripts/gen_messagecheatsheet.py
    trunk/sandbox/fcp2/test_fcp/test_client.py
    trunk/sandbox/fcp2/test_fcp/test_config.py
    trunk/sandbox/fcp2/test_fcp/test_message.py
    trunk/sandbox/fcp2/types.py
    trunk/sandbox/fcp2/uri.py

Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/client.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -197,15 +197,15 @@
 hack = _RelImportHack(2)
 
 
-import fcp.fcp2_0_consts as consts
-from fcp.fcp2_0_events import Events
-from fcp.fcp2_0_config import Config
-from fcp.fcp2_0_message import Message
-import fcp.fcp2_0_params as FcParams
-from fcp.fcp2_0_uri import Uri
+from fcp2 import consts
+from fcp2.config import Config
+from fcp2.events import Events
+from fcp2.message import Message
+import fcp2.params as FcParams
+from fcp2.uri import Uri
 
-from fcp.fcp_lib import namespace
-from fcp.fcp_lib import tools 
+from fcp2.fcp_lib import namespace
+from fcp2.fcp_lib import tools 
 
 
 del hack

Modified: trunk/sandbox/fcp2/config.py
===================================================================
--- trunk/sandbox/fcp2/config.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/config.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -12,9 +12,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(2)
 
-from fcp import fcp2_0_consts as consts
-from fcp import fcp2_0_types as types
-from fcp.fcp_lib import uuid
+from fcp2 import consts
+from fcp2 import types
+from fcp2.fcp_lib import uuid
 
 
 del hack

Modified: trunk/sandbox/fcp2/events.py
===================================================================
--- trunk/sandbox/fcp2/events.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/events.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -13,8 +13,8 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(2)
 
-from fcp import fcp2_0_types as types
-from fcp.fcp_lib import events
+from fcp2 import types
+from fcp2.fcp_lib import events
 
 
 del hack

Modified: trunk/sandbox/fcp2/message.py
===================================================================
--- trunk/sandbox/fcp2/message.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/message.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -13,9 +13,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(2)
 
-from fcp import fcp2_0_consts as consts
-from fcp import fcp2_0_types as types
-from fcp.fcp_lib import uuid
+from fcp2 import consts
+from fcp2 import types
+from fcp2.fcp_lib import uuid
 
 
 del hack

Modified: trunk/sandbox/fcp2/params.py
===================================================================
--- trunk/sandbox/fcp2/params.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/params.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -13,7 +13,7 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(2)
 
-from fcp.fcp_lib import uuid
+from fcp2.fcp_lib import uuid
 
 
 del hack

Modified: trunk/sandbox/fcp2/scripts/gen_docs.py
===================================================================
--- trunk/sandbox/fcp2/scripts/gen_docs.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/scripts/gen_docs.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -21,7 +21,7 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp.scripts import fcpscripts_consts as consts
+from fcp2.scripts import fcpscripts_consts as consts
 
 
 del hack

Modified: trunk/sandbox/fcp2/scripts/gen_messagecheatsheet.py
===================================================================
--- trunk/sandbox/fcp2/scripts/gen_messagecheatsheet.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/scripts/gen_messagecheatsheet.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -32,7 +32,7 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp.scripts import fcpscripts_consts as consts
+from fcp2.scripts import fcpscripts_consts as consts
 
 
 del hack

Modified: trunk/sandbox/fcp2/test_fcp/test_client.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_client.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/test_fcp/test_client.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -17,9 +17,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp import fcp2_0_client
-from fcp.fcp2_0_client import FcpClient
-from fcp import fcp2_0_consts as consts
+from fcp2 import client
+from fcp2.client import FcpClient
+from fcp2 import consts
 
 
 del hack
@@ -123,7 +123,7 @@
 	
 	# inject our customized socket module 
 	socketModule = DummySocketModule()
-	fcp2_0_client.socket = 	socketModule
+	client.socket = socketModule
 	
 	
 	def __init__(self, *args, **kwargs):

Modified: trunk/sandbox/fcp2/test_fcp/test_config.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_config.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/test_fcp/test_config.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -13,9 +13,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp.fcp2_0_client import FcpClient
+from fcp2.client import FcpClient
 Message = FcpClient.Message
-from fcp import fcp2_0_types as types
+from fcp2 import types
 
 del hack
 #<-- rel import hack

Modified: trunk/sandbox/fcp2/test_fcp/test_message.py
===================================================================
--- trunk/sandbox/fcp2/test_fcp/test_message.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/test_fcp/test_message.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -13,9 +13,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(3)
 
-from fcp.fcp2_0_client import FcpClient
+from fcp2.client import FcpClient
 Message = FcpClient.Message
-from fcp import fcp2_0_consts as consts
+from fcp2 import consts
 
 
 del hack

Modified: trunk/sandbox/fcp2/types.py
===================================================================
--- trunk/sandbox/fcp2/types.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/types.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -15,8 +15,8 @@
 	def __del__(self): sys.path.pop(0)
 hack =_RelImportHack(2)
 
-from fcp import fcp2_0_consts as consts
-from fcp.fcp_lib import numbers
+from fcp2 import consts
+from fcp2.fcp_lib import numbers
 
 
 del hack

Modified: trunk/sandbox/fcp2/uri.py
===================================================================
--- trunk/sandbox/fcp2/uri.py	2008-02-26 09:52:41 UTC (rev 256)
+++ trunk/sandbox/fcp2/uri.py	2008-02-26 10:01:29 UTC (rev 257)
@@ -14,10 +14,9 @@
 	def __del__(self): sys.path.pop(0)
 hack = _RelImportHack(2)
 
+from fcp2 import consts
 
-from fcp import fcp2_0_consts as consts
 
-
 del hack
 #<-- rel import hack
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.