Cleanup: Fix flake8 E722 do not use bare except

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 771fd57270a18a33b1a95bddb76d37cbc75cce7a..d81619da0d39e92e14d05bd7b8bd7e6546cbc109 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,16 +1,18 @@
 #! /usr/bin/env python
 
-__all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
-           'AuthorBook', 'BookGenre', 'open_db', 'init_db',
-           'insert_name', 'insert_author', 'update_counters',
-           ]
-
+from __future__ import print_function
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
     ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
     connectionForURI, sqlhub, SQLObjectNotFound, dberrors
+from .compat import string_type
 from .config import get_config
 
+__all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
+           'AuthorBook', 'BookGenre', 'open_db', 'init_db',
+           'insert_name', 'insert_author', 'update_counters',
+           ]
+
 
 class Author(SQLObject):
     surname = UnicodeCol(notNull=True)
@@ -20,6 +22,12 @@ class Author(SQLObject):
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='author_book',
                         createRelatedTable=False)
+
+    @property
+    def fullname(self):
+        fullnames = filter(None, (self.surname, self.name, self.misc_name))
+        return ' '.join(fullnames)
+
     full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
     count_idx = DatabaseIndex(count)
 
@@ -76,7 +84,7 @@ class BookGenre(SQLObject):
 
 
 class Extension(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)
 
@@ -93,7 +101,7 @@ class Genre(SQLObject):
 
 
 class Language(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)
 
@@ -124,7 +132,7 @@ def find_sqlite_dburi(db_dirs=None):
     else:
         # octal; -rw-------;
         # make the database file/directory readable/writeable only by the user
-        os.umask(0066)
+        os.umask(0o66)
         db_dir = db_dirs[0]
         try:
             os.makedirs(db_dir)
@@ -139,14 +147,19 @@ def open_db(db_uri=None):
     if db_uri is None:
         try:
             db_uri = get_config().get('database', 'URI')
-        except:
+        except Exception:
             db_uri = find_sqlite_dburi()
 
+    if '://' not in db_uri:
+        db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
+
     sqlhub.processConnection = connection = connectionForURI(db_uri)
 
     if connection.dbName == 'sqlite':
         def lower(s):
-            return s.lower()
+            if isinstance(s, string_type):
+                return s.lower()
+            return s
 
         sqlite = connection.module
 
@@ -209,8 +222,9 @@ def update_counters():
 
 def test():
     db_dirs = find_sqlite_db_dirs()
-    print "DB dirs:", db_dirs
-    print "DB URI:", find_sqlite_dburi()
+    print("DB dirs:", db_dirs)
+    print("DB URI:", find_sqlite_dburi())
+
 
 if __name__ == '__main__':
     test()