Changeset 112

Show
Ignore:
Timestamp:
Wed Sep 7 14:49:03 2005
Author:
drew
Message:

refactoring - imported new config to utils

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/xix/stitch.py

    r83 r112  
    46 46  
    47 47 from zope.interface import implements  
    48   from xix.kitchensink.aspout import getlogger, streams  
      48 from xix.utils.aspout import getlogger, streams  
    48 48 from xix.interfaces import INode  
    49 49 write = getlogger()  

  • trunk/xix/__init__.py

    r80 r112  
    73 73 ###  END #################################################################  
    74 74  
    75   __all__ = [ 'kitchensink', 'rend', 'stitch', 'services',  
      75 __all__ = [ 'utils', 'rend', 'stitch', 'services',  
    75 75         'interfaces', 'wheel', 'registry', 'xixxml']  

  • trunk/xix/scripts/xxrclient

    r78 r112  
    1 1 #!/usr/bin/env python  
    2 2 import xmlrpclib  
    3   from xix.kitchensink.aspout import WriterArbiterSequence as WAS  
    4   from xix.kitchensink.aspout import StandardArbiter as SA  
    5   from xix.kitchensink.aspout import OutputPipeline as OP  
    6   from xix.kitchensink.aspout import streams  
    7   from xix.kitchensink.aspout import console_writer  
    8   from xix.kitchensink.linux  import console_color_formatter, changeXtermTitle  
    9   from xix.kitchensink.console import format  
      3 from xix.utils.aspout import WriterArbiterSequence as WAS  
      4 from xix.utils.aspout import StandardArbiter as SA  
      5 from xix.utils.aspout import OutputPipeline as OP  
      6 from xix.utils.aspout import streams  
      7 from xix.utils.aspout import console_writer  
      8 from xix.utils.linux  import console_color_formatter, changeXtermTitle  
      9 from xix.utils.console import format  
    10 10  
    11 11  

  • trunk/xix/rend/tags.py

    r83 r112  
    12 12 from nevow.tags import tags  
    13 13 from xix.rend.pagelets import PageletProto, Pagelet, PageletCommentProto  
    14   from xix.kitchensink.aspout import getlogger  
      14 from xix.utils.aspout import getlogger  
    14 14 write = getlogger()  
    15 15          

  • trunk/xix/rend/container.py

    r83 r112  
    9 9 import xix.rend.tags as T  
    10 10 from nevow import rend, stan, loaders  
    11   from xix.kitchensink.aspout import getlogger  
      11 from xix.utils.aspout import getlogger  
    11 11 write = getlogger()  
    12 12  

  • trunk/xix/rend/pagelets.py

    r83 r112  
    12 12 from copy import copy, deepcopy  
    13 13 from xix.interfaces import IPageletFactory, IPagelet, IString  
    14   from xix.kitchensink.aspout import getlogger, streams  
      14 from xix.utils.aspout import getlogger, streams  
    14 14 write = getlogger()  
    15 15  

  • trunk/xix/xixxml/schema.py

    r83 r112  
    22 22  
    23 23 # XIX imports  
    24   from xix.kitchensink.aspout import getlogger, streams  
    25   from xix.kitchensink.string import trim, ind  
      24 from xix.utils.aspout import getlogger, streams  
      25 from xix.utils.string import trim, ind  
    26 26 write = getlogger()  
    27 27  

  • trunk/xix/xixxml/xmlbuilder.py

    r81 r112  
    15 15 from zope.interface import implements  
    16 16 from xix.interfaces import IXmlNamespace, IXmlFragment, IXmlNode, IXmlElement  
    17   from xix.kitchensink.python import setAll  
      17 from xix.utils.python import setAll  
    17 17  
    18 18 class XmlBuilderException(Exception):  

  • trunk/xix/xixxml/xultags.py

    r83 r112  
    12 12 import pickle, inspect  
    13 13  
    14   from xix.kitchensink.aspout import getlogger  
      14 from xix.utils.aspout import getlogger  
    14 14 write = getlogger()  
    15 15  

  • trunk/xix/wheel.py

    r83 r112  
    26 26 from xix import registry  
    27 27 from xix import stitch  
    28   from xix.kitchensink.aspout import getlogger; write = getlogger()  
      28 from xix.utils.aspout import getlogger; write = getlogger()  
    28 28  
    29 29  

  • trunk/xix/_io.py

    r68 r112  
    9 9  
    10 10 # N.B. Any writer for this package should be defined inside  
    11   # kitchensink.aspout module  
      11 # utils.aspout module  
    11 11  
    12   from kitchensink.aspout import default_writer, console_writer  
    13   from kitchensink.aspout import register_arbiters, calling_context_formatter, time_formatter  
    14   from kitchensink.linux  import console_color_formatter  
    15   from kitchensink.aspout import WriterArbiterSequence as WAS  
    16   from kitchensink.aspout import StandardArbiter as SA  
    17   from kitchensink.aspout import OutputPipeline as OP  
      12 from utils.aspout import default_writer, console_writer  
      13 from utils.aspout import register_arbiters, calling_context_formatter, time_formatter  
      14 from utils.linux  import console_color_formatter  
      15 from utils.aspout import WriterArbiterSequence as WAS  
      16 from utils.aspout import StandardArbiter as SA  
      17 from utils.aspout import OutputPipeline as OP  
    18 18  
    19 19 # Configure writers arbiter sequences for each module you want to register.  
    …… 
    22 22  
    23 23 NAMES_ARBITERS = {  
    24       'xix.kitchensink.string': WAS ( arbiters = [  
      24     'xix.utils.string': WAS ( arbiters = [  
    24 24             SA ( pipelines = [  
    25 25                 OP (  

  • trunk/xix/registry.py

    r91 r112  
    31 31 from xix.rend.render import XixPageRenderer, XixComposer  
    32 32 import xix.rend.tags  
    33   from xix.kitchensink import source  
    34   from xix.kitchensink.aspout import getlogger, streams  
      33 from xix.utils import source  
      34 from xix.utils.aspout import getlogger, streams  
    35 35 write = getlogger()  
    36 36  
    …… 
    759 759      
    760 760      
    761   from xix.kitchensink.python import allexcept  
      761 from xix.utils.python import allexcept  
    761 761 _dont_import = [ 'os', 'inspect', 'types', 'joinpath', 'abspath', 'nevow', 'HtmlPageFactory',  
    762 762              'PageletFactory', 'stitch', 'XixPageRenderer', 'XixComposer', 'xix', 'mywriter',  

  • trunk/xix/interfaces.py

    r84 r112  
    14 14  
    15 15 from zope.interface import Interface, Attribute, classImplements  
    16   from kitchensink.python import setAll  
      16 from utils.python import setAll  
    16 16  
    17 17  

  • trunk/runtests.py

    r86 r112  
    13 13 os.environ['XIXSITEPATH'] = os.path.abspath('xix/tests/data/xixpage'.replace('/',os.sep))  
    14 14 from xix import *  
      15 from tests import doctests as dt  
    15 16  
    16 17 __author__ = 'Drew Smathers'  
    …… 
    25 26     suite.addTest(doctest.DocTestSuite(rend.pagelets))  
    26 27     suite.addTest(doctest.DocTestSuite(rend.container))  
    27       suite.addTest(doctest.DocTestSuite(kitchensink.console))  
      28     suite.addTest(doctest.DocTestSuite(utils.console))  
      29     suite.addTest(doctest.DocTestSuite(utils.string))  
      30     suite.addTest(doctest.DocTestSuite(utils.config))  
    28 31     suite.addTest(doctest.DocTestSuite(xixxml.xmlbuilder))  
      32     suite.addTest(doctest.DocTestSuite(dt.utils.config))  
    29 33     runner = unittest.TextTestRunner(verbosity=2)  
    30 34     runner.run(suite)