Changeset 1441 for TI05-delivery


Ignore:
Timestamp:
22/08/06 14:12:28 (13 years ago)
Author:
spascoe
Message:

Embedded test cases and examples work when executed from a
virtual-python with delivery service installed.

Location:
TI05-delivery/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/trunk/examples/deliveryclient.py

    r1289 r1441  
    88 
    99HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir)) 
    10 BUILDDIR = glob('%s/build/lib.*' % HOME)[0] 
    1110VERSION = open('%s/VERSION' % HOME).read() 
    1211NDG_MESSAGE_LEN = 256 
     
    1413NDG_HANDSHAKE = "NDG-Delivery-client %s" % VERSION 
    1514 
    16  
    17 sys.path.append(BUILDDIR) 
    18  
    19 import pybbftp.client as DC 
     15import ndg.delivery.client.pybbftp as DC 
    2016 
    2117class AuthClientHandler(DC.AuthClientHandler): 
  • TI05-delivery/trunk/examples/deliveryd.py

    r1434 r1441  
    1010 
    1111HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir)) 
    12 BUILDDIR = glob('%s/build/lib.*' % HOME)[0] 
    1312DATADIR = '%s/test/data' % HOME 
    1413VERSION = open('%s/VERSION' % HOME).read() 
     
    1716NDG_HANDSHAKE = "NDG-Delivery-server %s" % VERSION 
    1817 
    19 sys.path.append(BUILDDIR) 
    2018 
    21 import pybbftp.server as server 
     19import ndg.delivery.server.pybbftp as server 
    2220 
    2321 
  • TI05-delivery/trunk/lib/python/ndg/delivery/client/pybbftp.py

    r1439 r1441  
    99 
    1010import sys 
    11 if sys.modules.has_key('pybbftp.bbftpd') and not sys.modules.has_key('epydoc'): 
    12     raise ImportError, "pybbftp.bbftpd extension already loaded.  You cannot use both client and server extensions together" 
     11if sys.modules.has_key('ndg.delivery.server.pybbftp.bbftpd') and not sys.modules.has_key('epydoc'): 
     12    raise ImportError, "ndg.delivery.server.pybbftp.bbftpd extension already loaded.  You cannot use both client and server extensions together" 
    1313 
    1414import bbftpc 
  • TI05-delivery/trunk/lib/python/ndg/delivery/server/pybbftp.py

    r1439 r1441  
    1313#       However if the module is being scanned by epydoc allow the import (This is a hack!) 
    1414import sys 
    15 if sys.modules.has_key('pybbftp.bbftpc') and not sys.modules.has_key('epydoc'): 
    16     raise ImportError, "pybbftp.bbftpc extension already loaded.  You cannot use both client and server extensions together" 
     15if sys.modules.has_key('ndg.delivery.client.pybbftp.bbftpc') and not sys.modules.has_key('epydoc'): 
     16    raise ImportError, "ndg.delivery.client.pybbftp.bbftpc extension already loaded.  You cannot use both client and server extensions together" 
    1717 
    1818import bbftpd 
  • TI05-delivery/trunk/test/runclient.py

    r1435 r1441  
    1111#HOME = os.path.abspath(os.getenv('NDG_DELIVERY_HOME', os.curdir)) 
    1212HOME = os.path.abspath(os.path.dirname(__file__)+'/..') 
    13 BUILDDIR = glob('%s/build/lib.*' % HOME)[0] 
    1413VERSION = open('%s/VERSION' % HOME).read() 
    1514NDG_MESSAGE_LEN = 256 
     
    1817 
    1918 
    20 sys.path.append(BUILDDIR) 
    2119 
    22 import pybbftp.client as DC 
     20import ndg.delivery.client.pybbftp as DC 
    2321 
    2422class AuthClientHandler(DC.AuthClientHandler): 
  • TI05-delivery/trunk/test/test_embedded.py

    r1345 r1441  
    2323sys.path.append(BUILDDIR) 
    2424 
    25 import pybbftp.server as server 
     25import ndg.delivery.server.pybbftp as server 
    2626import traceback 
    2727 
Note: See TracChangeset for help on using the changeset viewer.