Typo in setup.py. BaseException.message was deprecated.

diff --git a/librarian/__init__.py b/librarian/__init__.py
index 10c3766..dbdad5b 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -4,13 +4,7 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.  
 #
 class ParseError(Exception):
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.  
 #
 class ParseError(Exception):

-    
-    def __init__(self, cause, message=None):
-        self.cause = cause
-        try:
-            self.message = message or self.cause.message
-        except:
-            self.message = "No message."
+    pass

 
 class ValidationError(Exception):
     pass
 
 class ValidationError(Exception):
     pass


@@ -28,7 +22,7 @@ class XMLNamespace(object):
         return '{%s}%s' % (self.uri, tag)
 
     def __contains__(self, tag):
         return '{%s}%s' % (self.uri, tag)
 
     def __contains__(self, tag):

-        return tag.startswith('{'+str(self)+'}')
+        return tag.startswith('{' + str(self) + '}')

 
     def __repr__(self):
         return 'XMLNamespace(%r)' % self.uri
 
     def __repr__(self):
         return 'XMLNamespace(%r)' % self.uri


@@ -55,7 +49,7 @@ import lxml.etree as etree
 import dcparser
 
 DEFAULT_BOOKINFO = dcparser.BookInfo(
 import dcparser
 
 DEFAULT_BOOKINFO = dcparser.BookInfo(

-        { RDFNS('about'): u'http://wiki.wolnepodreczniki.pl/Lektury:Template'},\
+        { RDFNS('about'): u'http://wiki.wolnepodreczniki.pl/Lektury:Template'}, \

         { DCNS('creator'): [u'Some, Author'],
           DCNS('title'): [u'Some Title'],
           DCNS('subject.period'): [u'Unknown'],
         { DCNS('creator'): [u'Some, Author'],
           DCNS('title'): [u'Some Title'],
           DCNS('subject.period'): [u'Unknown'],


@@ -75,18 +69,18 @@ DEFAULT_BOOKINFO = dcparser.BookInfo(
             [u"Domena publiczna - zm. [OPIS STANU PRAWNEGO TEKSTU]"] })
 
 def xinclude_forURI(uri):
             [u"Domena publiczna - zm. [OPIS STANU PRAWNEGO TEKSTU]"] })
 
 def xinclude_forURI(uri):

-    e = etree.Element( XINS("include") )
+    e = etree.Element(XINS("include"))

     e.set("href", uri)
     return etree.tostring(e, encoding=unicode)
     e.set("href", uri)
     return etree.tostring(e, encoding=unicode)

-    
+

 def wrap_text(ocrtext, creation_date, bookinfo=DEFAULT_BOOKINFO):
     """Wrap the text within the minimal XML structure with a DC template."""
     bookinfo.created_at = creation_date
 def wrap_text(ocrtext, creation_date, bookinfo=DEFAULT_BOOKINFO):
     """Wrap the text within the minimal XML structure with a DC template."""
     bookinfo.created_at = creation_date

-    
-    dcstring = etree.tostring(bookinfo.to_etree(),\
+
+    dcstring = etree.tostring(bookinfo.to_etree(), \

         method='xml', encoding=unicode, pretty_print=True)
 
         method='xml', encoding=unicode, pretty_print=True)
 

-    return u'<utwor>\n' + dcstring + u'\n<plain-text>\n' + ocrtext +\
+    return u'<utwor>\n' + dcstring + u'\n<plain-text>\n' + ocrtext + \

         u'\n</plain-text>\n</utwor>';
 
 
         u'\n</plain-text>\n</utwor>';
 
 

diff --git a/setup.py b/setup.py
index 3bfb6ad..65c52ab 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,17 +12,16 @@ setup(
     description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats',
     author="Marek Stępniowski",
     author_email='marek@stepniowski.com',
     description='Converter from WolneLektury.pl XML-based language to XHTML, TXT and other formats',
     author="Marek Stępniowski",
     author_email='marek@stepniowski.com',

-    mantainer='Łukasz Rekucki',
-    mantainer_email='lrekucki@gmail.com',
-    url='http://github.com/fnp/librarian',    
+    maintainer='Łukasz Rekucki',
+    maintainer_email='lrekucki@gmail.com',
+    url='http://github.com/fnp/librarian',

     packages=['librarian'],
     packages=['librarian'],

-    package_data = {'librarian': ['xslt/*.xslt']},
+    package_data={'librarian': ['xslt/*.xslt']},

     include_package_data=True,
     install_requires=['lxml>=2.2'],
     include_package_data=True,
     install_requires=['lxml>=2.2'],

-    scripts=['scripts/book2html', 
-             'scripts/book2txt', 
-             'scripts/bookfragments', 
+    scripts=['scripts/book2html',
+             'scripts/book2txt',
+             'scripts/bookfragments',

              'scripts/genslugs'],
              'scripts/genslugs'],

-             

     tests_require=['nose>=0.11', 'coverage>=3.0.1'],
 )
     tests_require=['nose>=0.11', 'coverage>=3.0.1'],
 )