X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=m_librarian%2Fglst.py;h=0ceba1a350f64a7da2a91fb83f32a3f33246c0b5;hb=3d1c4c583c1f16d9775f438b7472ccf43a79698b;hp=2de36c3a92180b7abaf1b7b76079e51938e93c06;hpb=7e963f12cfc58f88b35fb8071c63f9e47b2a51f7;p=m_librarian.git

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index 2de36c3..0ceba1a 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,12 +1,13 @@
 #! /usr/bin/env python
 
-__all__ = ['import_glst']
-
+from __future__ import print_function
 import codecs
 import os
 from sqlobject import sqlhub, SQLObjectNotFound
 from .db import Genre
 
+__all__ = ['import_glst']
+
 
 def parse_glst_file(glst_filename):
     glst_file = codecs.open(glst_filename, 'r', 'utf-8')
@@ -47,8 +48,10 @@ def _import_glst():
     old_nonfb2, new_nonfb2 = import_glst_file(
         os.path.join(ml_dir, 'glst', 'genres_nonfb2.glst'))
     connection = sqlhub.processConnection
-    if connection.dbName in ('postgres', 'sqlite'):
+    if connection.dbName == 'postgres':
         connection.query("VACUUM %s" % Genre.sqlmeta.table)
+    elif connection.dbName == 'sqlite':
+        connection.query("VACUUM")
     return old_fb2 + old_nonfb2, new_fb2 + new_nonfb2
 
 
@@ -58,7 +61,7 @@ def import_glst():
 
 def test():
     ml_dir = os.path.dirname(__file__)
-    print parse_glst_file(os.path.join(ml_dir, 'glst', 'genres_fb2.glst'))
+    print(parse_glst_file(os.path.join(ml_dir, 'glst', 'genres_fb2.glst')))
 
 if __name__ == '__main__':
     test()