[PyWrapper-devel] Revision 983

[Skofic A. M. (IPGRI) <m.s...@cg...>]

I think you have a problem with this revision: I stopped the server,  
updated with svn and when I restarted the server I got:

$ python/bin/python ../webapp/start_server.py 8080
Traceback (most recent call last):
   File "../webapp/start_server.py", line 60, in ?
     import cherrypy, biocase.configuration, root, pywrapper
   File "/Library/WebServer/Services/pywrapper/webapp/root.py", line  
17, in ?
     import page, biocase.configuration
   File "/Library/WebServer/Services/pywrapper/webapp/page.py", line  
4, in ?
     import biocase.pywrapper
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
__init__.py", line 48, in ?
     from biocase.pywrapper.pywrappercgi import PyWrapper,  
UnknownProtocolError
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
pywrappercgi.py", line 20, in ?
     from datasource_factory import buildDatasourceObj
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
datasource_factory.py", line 12, in ?
     from biocase.pywrapper.datasource import Datasource
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
datasource.py", line 26, in ?
     from biocase.pywrapper.datasource_handler   import  
datasourcePrefsHandler, DATASOURCE_NS
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
datasource_handler.py", line 19, in ?
     from biocase.pywrapper.graph.tablegraph     import  
tableGraphClass, tableAliasClass
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
graph/tablegraph.py", line 23, in ?
     from biocase.pywrapper.filter.logical import AndClass
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
filter/__init__.py", line 35, in ?
     importFilterClasses()
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
filter/__init__.py", line 20, in importFilterClasses
     module = __import__('biocase.pywrapper.filter.'+modulename, {},  
{}, modulename)
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
filter/comparison.py", line 20, in ?
     from biocase.pywrapper.filter.concept import ExtConceptClass
   File "/Library/WebServer/Services/pywrapper/lib/biocase/pywrapper/ 
filter/concept.py", line 19, in ?
     cfgObj=biocase.configuration.Cfg()
   File "/Library/WebServer/Services/pywrapper/lib/biocase/ 
configuration.py", line 57, in __call__
     cls.__instance=super(Singleton,cls).__call__(*args,**kw)
   File "/Library/WebServer/Services/pywrapper/lib/biocase/ 
configuration.py", line 216, in __init__
     self._readConfigFiles(configFilename=configFilename)
   File "/Library/WebServer/Services/pywrapper/lib/biocase/ 
configuration.py", line 225, in _readConfigFiles
     self.__addCfgFile__(configFilename)
   File "/Library/WebServer/Services/pywrapper/lib/biocase/ 
configuration.py", line 278, in __addCfgFile__
     cfg.read(configFilename)
   File "/Library/WebServer/Services/pywrapper/tools/python/lib/ 
python2.4/ConfigParser.py", line 267, in read
     self._read(fp, filename)
   File "/Library/WebServer/Services/pywrapper/tools/python/lib/ 
python2.4/ConfigParser.py", line 490, in _read
     raise e
ConfigParser.ParsingError: File contains parsing errors: /Library/ 
WebServer/Services/pywrapper/config/config.ini
         [line 21]: '<<<<<<< .mine\n'
         [line 23]: '=======\n'
         [line 26]: '>>>>>>> .r983\n'