don't pass self.

[librarian.git] / librarian / __init__.py

diff --git a/librarian/__init__.py b/librarian/__init__.py
index dd09ce4..09bdcd7 100644 (file)
--- a/librarian/__init__.py
+++ b/librarian/__init__.py
@@ -8,24 +8,34 @@ from __future__ import with_statement
 import os
 import re
 import shutil
+import urllib
 
-class ParseError(Exception):
+
+class UnicodeException(Exception):
     def __str__(self):
         """ Dirty workaround for Python Unicode handling problems. """
-        return self.message
+        return unicode(self).encode('utf-8')
 
     def __unicode__(self):
         """ Dirty workaround for Python Unicode handling problems. """
-        return self.message
+        args = self.args[0] if len(self.args) == 1 else self.args
+        try:
+            message = unicode(args)
+        except UnicodeDecodeError:
+            message = unicode(args, encoding='utf-8', errors='ignore')
+        return message
+
+class ParseError(UnicodeException):
+    pass
 
-class ValidationError(Exception):
+class ValidationError(UnicodeException):
     pass
 
 class NoDublinCore(ValidationError):
     """There's no DublinCore section, and it's required."""
     pass
 
-class NoProvider(Exception):
+class NoProvider(UnicodeException):
     """There's no DocProvider specified, and it's needed."""
     pass
 
@@ -69,8 +79,8 @@ class WLURI(object):
     """Represents a WL URI. Extracts slug from it."""
     slug = None
 
-    example = 'http://wolnelektury.pl/katalog/lektura/template/'
-    _re_wl_uri = re.compile('http://wolnelektury.pl/katalog/lektura/'
+    example = 'http://edukacjamedialna.edu.pl/'
+    _re_wl_uri = re.compile(r'http://(www\.)?edukacjamedialna.edu.pl/'
             '(?P<slug>[-a-z0-9]+)/?$')
 
     def __init__(self, uri):
@@ -82,8 +92,8 @@ class WLURI(object):
     def strict(cls, uri):
         match = cls._re_wl_uri.match(uri)
         if not match:
-            raise ValueError('Supplied URI (%s) does not match '
-                'the template: %s.' % (uri, cls._re_wl_uri))
+            raise ValidationError(u'Invalid URI (%s). Should match: %s' % (
+                        uri, cls._re_wl_uri.pattern))
         return cls(uri)
 
     @classmethod
@@ -94,7 +104,7 @@ class WLURI(object):
         u'http://wolnelektury.pl/katalog/lektura/a-slug/'
 
         """
-        uri = 'http://wolnelektury.pl/katalog/lektura/%s/' % slug
+        uri = 'http://prawokultury.pl/publikacje/%s/' % slug
         return cls(uri)
 
     def __unicode__(self):
@@ -140,7 +150,10 @@ import dcparser
 
 DEFAULT_BOOKINFO = dcparser.BookInfo(
         { RDFNS('about'): u'http://wiki.wolnepodreczniki.pl/Lektury:Template'},
-        { DCNS('creator'): [u'Some, Author'],
+        { 
+          DCNS('creator.expert'): [u'Some, Author'],
+          DCNS('creator.scenario'): [u'Some, Author'],
+          DCNS('creator.textbook'): [u'Some, Author'],
           DCNS('title'): [u'Some Title'],
           DCNS('subject.period'): [u'Unknown'],
           DCNS('subject.type'): [u'Unknown'],
@@ -264,3 +277,8 @@ class OutputFile(object):
         if not os.path.isdir(dirname):
             os.makedirs(dirname)
         shutil.copy(self.get_filename(), path)
+
+
+class URLOpener(urllib.FancyURLopener):
+    version = 'FNP Librarian (http://github.com/fnp/librarian)'
+urllib._urlopener = URLOpener()