Index: pykota/trunk/pykota/storages/mysqlstorage.py
===================================================================
--- pykota/trunk/pykota/storages/mysqlstorage.py (revision 2821)
+++ pykota/trunk/pykota/storages/mysqlstorage.py (revision 2830)
@@ -26,5 +26,5 @@
 import time
 
-from pykota.storage import PyKotaStorageError,BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota
+from pykota.storage import PyKotaStorageError, BaseStorage
 from pykota.storages.sql import SQLStorage
 
Index: pykota/trunk/pykota/storages/pgstorage.py
===================================================================
--- pykota/trunk/pykota/storages/pgstorage.py (revision 2773)
+++ pykota/trunk/pykota/storages/pgstorage.py (revision 2830)
@@ -26,5 +26,5 @@
 from types import StringType
 
-from pykota.storage import PyKotaStorageError,BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota
+from pykota.storage import PyKotaStorageError, BaseStorage
 from pykota.storages.sql import SQLStorage
 
Index: pykota/trunk/pykota/storages/sql.py
===================================================================
--- pykota/trunk/pykota/storages/sql.py (revision 2787)
+++ pykota/trunk/pykota/storages/sql.py (revision 2830)
@@ -23,6 +23,5 @@
 #
 
-from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject, \
-                           StorageUser, StorageGroup, StoragePrinter, \
+from pykota.storage import StorageUser, StorageGroup, StoragePrinter, \
                            StorageJob, StorageLastJob, StorageUserPQuota, \
                            StorageGroupPQuota, StorageBillingCode
Index: pykota/trunk/pykota/storages/ldapstorage.py
===================================================================
--- pykota/trunk/pykota/storages/ldapstorage.py (revision 2798)
+++ pykota/trunk/pykota/storages/ldapstorage.py (revision 2830)
@@ -30,5 +30,4 @@
 
 import sys
-import os
 import types
 import time
@@ -39,5 +38,5 @@
 from mx import DateTime
 
-from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject, \
+from pykota.storage import PyKotaStorageError, BaseStorage, \
                            StorageUser, StorageGroup, StoragePrinter, \
                            StorageJob, StorageLastJob, StorageUserPQuota, \
@@ -827,7 +826,7 @@
         names = [self.userCharsetToDatabase(n) for n in names]
         if self.info["userquotabase"].lower() == "user" :
-           base = self.info["userbase"]
+            base = self.info["userbase"]
         else :
-           base = self.info["userquotabase"]
+            base = self.info["userquotabase"]
         result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % \
                                   (pname, "".join(["(pykotaUserName=%s)" % uname for uname in names])), \
@@ -872,7 +871,7 @@
         names = [self.userCharsetToDatabase(n) for n in names]
         if self.info["groupquotabase"].lower() == "group" :
-           base = self.info["groupbase"]
+            base = self.info["groupbase"]
         else :
-           base = self.info["groupquotabase"]
+            base = self.info["groupquotabase"]
         result = self.doSearch("(&(objectClass=pykotaGroupPQuota)(pykotaPrinterName=%s)(|%s))" % \
                                   (pname, "".join(["(pykotaGroupName=%s)" % gname for gname in names])), \
Index: pykota/trunk/pykota/storages/sqlitestorage.py
===================================================================
--- pykota/trunk/pykota/storages/sqlitestorage.py (revision 2773)
+++ pykota/trunk/pykota/storages/sqlitestorage.py (revision 2830)
@@ -25,5 +25,5 @@
 import time
 
-from pykota.storage import PyKotaStorageError,BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota
+from pykota.storage import PyKotaStorageError, BaseStorage
 from pykota.storages.sql import SQLStorage
 
