CVS commit: cms.py

Tue May 6 17:44:55 CEST 2008

Update of /var/lib/cvs/wiking/lib/wiking/cms
In directory cesnet:/tmp/cvs-serv9644/lib/wiking/cms

Modified Files:
	cms.py 
Log Message:
Always locate Wiking modules through resolver.  Added support for specifying Python modules
searched for Wiking modules in configuration.

/var/www/hosts/www.freebsoft.org/src/wiking:
cvs update: Updating .
? config.pyc
cvs update: Updating defs
cvs update: Updating doc
cvs update: Updating doc/src
cvs update: Updating doc/src/admin
? doc/src/admin/config.pyc
cvs update: Updating doc/src/cms
cvs update: Updating doc/src/devel
? doc/src/devel/application.pyc
cvs update: Updating doc/src/user
cvs update: Updating lib
cvs update: Updating lib/wiking
U lib/wiking/configuration.py
U lib/wiking/db.py
U lib/wiking/handler.py
U lib/wiking/modules.py
U lib/wiking/util.py
? lib/wiking/__init__.pyc
? lib/wiking/application.pyc
? lib/wiking/cms
? lib/wiking/configuration.pyc
? lib/wiking/db.pyc
? lib/wiking/export.pyc
? lib/wiking/modules.pyc
? lib/wiking/request.pyc
? lib/wiking/util.pyc
cvs update: Updating lib/wiking/cms
RCS file: /var/lib/cvs/wiking/lib/wiking/cms/cms.py,v
retrieving revision 1.24
retrieving revision 1.25
Merging differences between 1.24 and 1.25 into cms.py
lib/wiking/cms/cms.py already contains the differences between 1.24 and 1.25
cvs update: Updating resources
cvs update: Updating resources/css
cvs update: Updating sql
cvs update: Updating translations

+ mkdir -p /var/www/hosts/www.freebsoft.org/doc/wiking
+ PYTHONPATH=/var/www/hosts/www.freebsoft.org/src/wiking/../wiking/lib
+ /var/www/hosts/www.freebsoft.org/src/wiking/../lcg/bin/lcgmake.py /var/www/hosts/www.freebsoft.org/src/wiking/doc/src /var/www/hosts/www.freebsoft.org/doc/wiking
TypeError
Python 2.4.4: /usr/bin/python
Tue May  6 17:44:55 2008

A problem occurred in a Python script.  Here is the sequence of
function calls leading up to the error, in the order they occurred.

 /var/www/hosts/www.freebsoft.org/src/lcg/bin/lcgmake.py 
  168 if __name__ == "__main__":
  169     try:
  170         main()
  171     except KeyboardInterrupt:
  172         raise
main = <function main>

 /var/www/hosts/www.freebsoft.org/src/lcg/bin/lcgmake.py in main()
   84     #######################################################################################
   85     # Read the source files (first real action after processing options).
   86     reader = lcg.reader(src, name, ext=ext, recourse=recourse, encoding=opt['encoding'])
   87     node = reader.build()
   88     # Decide which exporter to use.
reader undefined
global lcg = <module 'lcg' from '/usr/local/lib/python2.4/site-packages/lcg/__init__.pyc'>
lcg.reader = <function reader>
src = '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src'
name = 'index'
ext = 'txt'
recourse = True
encoding undefined
opt = {'encoding': 'utf-8', 'ext': 'txt', 'hhp': False, 'html': False, 'ims': False, 'inline-styles': False, 'lang': None, 'pdf': False, 'root': 'index', 'sec-lang': None, ...}

 /usr/local/lib/python2.4/site-packages/lcg/read.py in reader(dir='/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', name='index', root=True, encoding='utf-8', ext='txt', parent=None, **kwargs={'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'ext': 'txt', 'recourse': True})
  332     if issubclass(cls, FileReader):
  333         kwargs = dict(kwargs, dir=dir, encoding=encoding)
  334         if issubclass(cls, DocFileReader):
  335             kwargs['ext'] = ext
  336     return cls(name, parent=parent, **kwargs)
cls = <class 'lcg.read.DocDirReader'>
name = 'index'
parent = None
kwargs = {'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'ext': 'txt', 'recourse': True}

 /usr/local/lib/python2.4/site-packages/lcg/read.py in __init__(self=<lcg.read.DocDirReader object>, id='index', ext='txt', **kwargs={'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'parent': None, 'recourse': True})
  249         """
  250         self._ext = ext
  251         super(DocFileReader, self).__init__(id, **kwargs)
  252 
  253     def _variants(self):
builtinsuper = <type 'super'>
global DocFileReader = <class 'lcg.read.DocFileReader'>
self = <lcg.read.DocDirReader object>
).__init__ = <bound method DocDirReader.__init__ of <lcg.read.DocDirReader object>>
id = 'index'
kwargs = {'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'parent': None, 'recourse': True}

 /usr/local/lib/python2.4/site-packages/lcg/read.py in __init__(self=<lcg.read.DocDirReader object>, *args=('index',), **kwargs={'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'parent': None, 'recourse': True})
  195     def __init__(self, *args, **kwargs):
  196         self._parser = Parser()
  197         super(StructuredTextReader, self).__init__(*args, **kwargs)
  198 
  199     def _source_text(self, lang):
builtinsuper = <type 'super'>
global StructuredTextReader = <class 'lcg.read.StructuredTextReader'>
self = <lcg.read.DocDirReader object>
).__init__ = <bound method DocDirReader.__init__ of <lcg.read.DocDirReader object>>
args = ('index',)
kwargs = {'dir': '/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', 'encoding': 'utf-8', 'parent': None, 'recourse': True}

 /usr/local/lib/python2.4/site-packages/lcg/read.py in __init__(self=<lcg.read.DocDirReader object>, id='index', dir='/var/www/hosts/www.freebsoft.org/src/wiking/doc/src', encoding='utf-8', **kwargs={'parent': None, 'recourse': True})
  132                and codecs.lookup(encoding)
  133         self._dir = os.path.normpath(dir)
  134         super(FileReader, self).__init__(id, **kwargs)
  135         if not encoding and self._parent and isinstance(self._parent, FileReader):
  136             encoding = self._parent.encoding()
builtinsuper = <type 'super'>
global FileReader = <class 'lcg.read.FileReader'>
self = <lcg.read.DocDirReader object>
).__init__ = <bound method DocDirReader.__init__ of <lcg.read.DocDirReader object>>
id = 'index'
kwargs = {'parent': None, 'recourse': True}
TypeError: __init__() got an unexpected keyword argument 'recourse'
    __doc__ = 'Inappropriate argument type.'
    __getitem__ = <bound method TypeError.__getitem__ of <exceptions.TypeError instance>>
    __init__ = <bound method TypeError.__init__ of <exceptions.TypeError instance>>
    __module__ = 'exceptions'
    __str__ = <bound method TypeError.__str__ of <exceptions.TypeError instance>>
    args = ("__init__() got an unexpected keyword argument 'recourse'",)

The above is a description of an error in a Python program.  Here is
the original traceback:

Traceback (most recent call last):
  File "/var/www/hosts/www.freebsoft.org/src/wiking/../lcg/bin/lcgmake.py", line 170, in ?
    main()
  File "/var/www/hosts/www.freebsoft.org/src/wiking/../lcg/bin/lcgmake.py", line 86, in main
    reader = lcg.reader(src, name, ext=ext, recourse=recourse, encoding=opt['encoding'])
  File "/usr/local/lib/python2.4/site-packages/lcg/read.py", line 336, in reader
    return cls(name, parent=parent, **kwargs)
  File "/usr/local/lib/python2.4/site-packages/lcg/read.py", line 251, in __init__
    super(DocFileReader, self).__init__(id, **kwargs)
  File "/usr/local/lib/python2.4/site-packages/lcg/read.py", line 197, in __init__
    super(StructuredTextReader, self).__init__(*args, **kwargs)
  File "/usr/local/lib/python2.4/site-packages/lcg/read.py", line 134, in __init__
    super(FileReader, self).__init__(id, **kwargs)
TypeError: __init__() got an unexpected keyword argument 'recourse'