X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=ecabfdbcfd146cf583ea2d8aa6dcfe1e1a7d1be0;hb=061a45aba1f91ec167eb9ac283a4c0a0afb52798;hp=9a48caa8fdade56f6ca38f86f393ad410ef98b5d;hpb=1b4e677c375c8d518574c84406428f1ccbcc6022;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 9a48caa..ecabfdb 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 
+from __future__ import print_function
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
     ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
@@ -20,6 +21,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)
 
@@ -124,7 +131,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)
@@ -142,13 +149,8 @@ def open_db(db_uri=None):
         except:
             db_uri = find_sqlite_dburi()
 
-    if db_uri.startswith(os.sep) or db_uri.startswith(os.altsep) \
-            or db_uri.startswith(os.pardir + os.sep) \
-            or db_uri.startswith(os.pardir + os.altsep):
-        if db_uri.startswith(os.pardir + os.sep) \
-        or db_uri.startswith(os.pardir + os.altsep):
-            db_uri = os.path.abspath(db_uri)
-        db_uri = 'sqlite://' + db_uri.replace(os.sep, '/')
+    if '://' not in db_uri:
+        db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
 
     sqlhub.processConnection = connection = connectionForURI(db_uri)
 
@@ -219,8 +221,8 @@ 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()