Ver código fonte

More cleanups because of postgresql

oz123 10 anos atrás
pai
commit
0dcd510cd5
2 arquivos alterados com 2 adições e 6 exclusões
  1. 1 5
      pwman/data/database.py
  2. 1 1
      pwman/util/crypto_engine.py

+ 1 - 5
pwman/data/database.py

@@ -30,10 +30,6 @@ class DatabaseException(Exception):
 
 class Database(object):
 
-    #def __init__(self, dbver=None):
-    #    self._filtertags = []
-    #    self.dbver = dbver
-
     def open(self, dbver=None):
         """
         Open the database, by calling the _open method of the
@@ -44,7 +40,7 @@ class Database(object):
         key = self.loadkey()
         """
         self._open()
-        enc = CryptoEngine.get(dbver=dbver)
+        enc = CryptoEngine.get()
         key = self.loadkey()
         if key is not None:
             enc.set_cryptedkey(key)

+ 1 - 1
pwman/util/crypto_engine.py

@@ -103,7 +103,7 @@ class CryptoEngine(object):  # pagma: no cover
     _callback = None
 
     @classmethod
-    def get(cls, dbver=None, timeout=-1):
+    def get(cls, timeout=-1):
         if CryptoEngine._instance:
             return CryptoEngine._instance