Update code for compatibility with Python 3

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 8786a461b8c69e4dd6fcfd032abce9054e5d7ddc..ecabfdbcfd146cf583ea2d8aa6dcfe1e1a7d1be0 100755 (executable)
--- 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)
@@ -214,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()