Small cleanups.

src/calibre/library/database2.py

@@ -215,7 +215,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
                 if not restore_all_prefs and key in frozenset(['news_to_be_synced']):
                     continue
                 dbprefs[key] = default_prefs[key]
-                progress_callback(_('Restored preference ') + key, i+1)
+                progress_callback(_('restored preference ') + key, i+1)
             if 'field_metadata' in default_prefs:
                 fmvals = [f for f in default_prefs['field_metadata'].values() if f['is_custom']]
                 progress_callback(None, len(fmvals))

src/calibre/library/prefs.py

@@ -81,7 +81,7 @@ class DBPrefs(dict):
             traceback.print_exc()
 
     @classmethod
-    def read_serialized(self, library_path, recreate_prefs=False):
+    def read_serialized(cls, library_path, recreate_prefs=False):
         try:
             from_filename = os.path.join(library_path,
                     'metadata_db_prefs_backup.json')
@@ -89,15 +89,15 @@ class DBPrefs(dict):
                 d = json.load(f, object_hook=from_json)
                 if not recreate_prefs:
                     return d
-                self.clear()
+                cls.clear()
-                self.db.conn.execute('DELETE FROM preferences')
+                cls.db.conn.execute('DELETE FROM preferences')
                 for k,v in d.iteritems():
-                    raw = self.to_raw(v)
+                    raw = cls.to_raw(v)
-                    self.db.conn.execute(
+                    cls.db.conn.execute(
                         'INSERT INTO preferences (key,val) VALUES (?,?)', (k, raw))
-                self.db.conn.commit()
+                cls.db.conn.commit()
-                self.clear()
+                cls.clear()
-                self.update(d)
+                cls.update(d)
                 return d
         except:
             import traceback