Changeset 1843 for TI03-DataExtractor


Ignore:
Timestamp:
08/12/06 13:15:18 (13 years ago)
Author:
spascoe
Message:

Moved import statements out of init.py.

Location:
TI03-DataExtractor/branches/repackaging/server
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI03-DataExtractor/branches/repackaging/server/ndg/dx/server/DXController.py

    r1774 r1843  
    1616import time, getopt 
    1717 
    18 # Bring package into local scope 
    19 from ndg.dx.server import * 
     18####################################################################### 
     19# 
     20# The following imports have been moved from ndg.dx.server.__init__.py 
     21# to avoid unnecessary imports and fix a configuration problem. 
     22 
     23# SecurityManager is the class used to implement security 
     24from SecurityManager import SecurityManager 
     25 
     26# common.py - common variables, functions and classes that are  
     27# not configured by users. 
     28from common import * 
     29 
     30# OptionHandler is a class to allow user-friendly 
     31# method calls to query the current options during a session. 
     32from OptionHandler import OptionHandler  
     33 
     34# RequestDict is the wrapper class for the request dictionary 
     35from RequestDict import RequestDict 
     36 
     37# SessionObject manages sessions and state 
     38from SessionObject import SessionObject 
     39 
     40# CDMSDataHandler is the class that allows a CDMS dataset to be interrogated. 
     41from CDMSDataHandler import CDMSDataHandler 
     42 
     43# CDMSOutputHandler is the class for writing output files via CDMS. 
     44from CDMSOutputHandler import CDMSOutputHandler 
     45 
     46# CSMLDataHandler is the class that allows a CSML dataset to be interrogated. 
     47from CSMLDataHandler import CSMLDataHandler 
     48 
     49# CSMLOutputHandler is the class that might allow CSML/NetCDF to be written. 
     50# Note: It might not actually be needed! 
     51from CSMLOutputHandler import CSMLOutputHandler 
     52 
     53# MIDASDataHandler is the class that allows a MIDAS dataset to be interrogated. 
     54from MIDASDataHandler import MIDASDataHandler 
     55 
     56# MIDASOutputHandler is a dummy class. 
     57# Note: It might not actually be needed! 
     58from MIDASOutputHandler import MIDASOutputHandler 
     59 
     60# OutputManager is the class used to match the request to the dataset and 
     61# actually extract data. 
     62from OutputManager import OutputManager 
     63 
     64# The DXDMLHandler class to support the  
     65# parsing of the Data Inputs XML document. 
     66from DXDMLHandler import DXDMLHandler 
     67 
     68# The DXRMLHandler.py module holds classes to handle 
     69# the request XML objects 
     70from DXRMLHandler import *  
     71 
     72# DateTimeManager.py holds useful time operations and conversions 
     73from DateTimeManager import * 
     74 
     75# CreditManager controls how access to a resource each user has 
     76from CreditManager import CreditManager 
     77 
     78# LogManager looks after logging to error and success logs 
     79from LogManager import LogManager 
     80 
     81# DXErrors holds all the error classes 
     82from DXErrors import * 
     83  
     84# MailManager class deals with mailing users or administrator 
     85from MailManager import * 
     86 
     87# DatasetFormatDecider class works out what underlying dataset format is used. 
     88from DatasetFormatDecider import DatasetFormatDecider 
     89 
     90####################################################################### 
    2091 
    2192# import configuration 
  • TI03-DataExtractor/branches/repackaging/server/ndg/dx/server/__init__.py

    r1774 r1843  
    99Initialisation module for the Data Extractor package. 
    1010 
    11 This module points to the relevant modules and classes to  
    12 bring them into the scope of the extractor package. 
     11@note: Imports have been moved to individual modules. 
    1312 
    1413""" 
    1514 
    16 # SecurityManager is the class used to implement security 
    17 from SecurityManager import SecurityManager 
    1815 
    19 # common.py - common variables, functions and classes that are  
    20 # not configured by users. 
    21 from common import * 
    22  
    23 # OptionHandler is a class to allow user-friendly 
    24 # method calls to query the current options during a session. 
    25 from OptionHandler import OptionHandler  
    26  
    27 # RequestDict is the wrapper class for the request dictionary 
    28 from RequestDict import RequestDict 
    29  
    30 # SessionObject manages sessions and state 
    31 from SessionObject import SessionObject 
    32  
    33 # CDMSDataHandler is the class that allows a CDMS dataset to be interrogated. 
    34 from CDMSDataHandler import CDMSDataHandler 
    35  
    36 # CDMSOutputHandler is the class for writing output files via CDMS. 
    37 from CDMSOutputHandler import CDMSOutputHandler 
    38  
    39 # CSMLDataHandler is the class that allows a CSML dataset to be interrogated. 
    40 from CSMLDataHandler import CSMLDataHandler 
    41  
    42 # CSMLOutputHandler is the class that might allow CSML/NetCDF to be written. 
    43 # Note: It might not actually be needed! 
    44 from CSMLOutputHandler import CSMLOutputHandler 
    45  
    46 # MIDASDataHandler is the class that allows a MIDAS dataset to be interrogated. 
    47 from MIDASDataHandler import MIDASDataHandler 
    48  
    49 # MIDASOutputHandler is a dummy class. 
    50 # Note: It might not actually be needed! 
    51 from MIDASOutputHandler import MIDASOutputHandler 
    52  
    53 # OutputManager is the class used to match the request to the dataset and 
    54 # actually extract data. 
    55 from OutputManager import OutputManager 
    56  
    57 # The DXDMLHandler class to support the  
    58 # parsing of the Data Inputs XML document. 
    59 from DXDMLHandler import DXDMLHandler 
    60  
    61 # The DXRMLHandler.py module holds classes to handle 
    62 # the request XML objects 
    63 from DXRMLHandler import *  
    64  
    65 # DateTimeManager.py holds useful time operations and conversions 
    66 from DateTimeManager import * 
    67  
    68 # CreditManager controls how access to a resource each user has 
    69 from CreditManager import CreditManager 
    70  
    71 # LogManager looks after logging to error and success logs 
    72 from LogManager import LogManager 
    73  
    74 # DXErrors holds all the error classes 
    75 from DXErrors import * 
    76   
    77 # MailManager class deals with mailing users or administrator 
    78 from MailManager import * 
    79  
    80 # DatasetFormatDecider class works out what underlying dataset format is used. 
    81 from DatasetFormatDecider import DatasetFormatDecider 
    82  
  • TI03-DataExtractor/branches/repackaging/server/setup.py

    r1841 r1843  
    99from setuptools import setup, find_packages 
    1010 
    11 # 'python setup.py test' imports modules in the package before it runs the test_suite 
    12 # This screws up any attempt to set NDG_HOME and put a suitable ndg.conf in it for testing. 
    13 # I'm hoping this will solve the problem. 
    1411from setuptools.command.test import test 
    1512class ndgTest(test): 
     
    2825 
    2926    def finalize_options(self): 
    30         test.initialize_options(self) 
     27        test.finalize_options(self) 
    3128        if not self.test_home: 
    3229            self.test_home = './test_ndg_home' 
     
    3835        if os.path.exists(self.test_home): 
    3936            shutil.rmtree(self.test_home) 
    40             os.mkdir(self.test_home) 
     37        os.mkdir(self.test_home) 
    4138        # Set NDG_HOME to be picked up by ndg.utils.config 
    4239        os.environ['NDG_HOME'] = self.test_home 
    4340 
     41        # At this point it is safe to import the configuration. 
    4442        # get global configuration (this will read /etc/ndg.conf) 
    4543        from ndg.utils.config import config 
     
    5957        # Run the tests 
    6058        return test.run(self) 
     59 
    6160 
    6261setup( 
Note: See TracChangeset for help on using the changeset viewer.