Changeset 2830 for pykota/trunk/pykota/storages
- Timestamp:
- 04/04/06 11:40:56 (18 years ago)
- Location:
- pykota/trunk/pykota/storages
- Files:
-
- 5 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r2798 r2830 30 30 31 31 import sys 32 import os33 32 import types 34 33 import time … … 39 38 from mx import DateTime 40 39 41 from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject,\40 from pykota.storage import PyKotaStorageError, BaseStorage, \ 42 41 StorageUser, StorageGroup, StoragePrinter, \ 43 42 StorageJob, StorageLastJob, StorageUserPQuota, \ … … 827 826 names = [self.userCharsetToDatabase(n) for n in names] 828 827 if self.info["userquotabase"].lower() == "user" : 829 base = self.info["userbase"]828 base = self.info["userbase"] 830 829 else : 831 base = self.info["userquotabase"]830 base = self.info["userquotabase"] 832 831 result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % \ 833 832 (pname, "".join(["(pykotaUserName=%s)" % uname for uname in names])), \ … … 872 871 names = [self.userCharsetToDatabase(n) for n in names] 873 872 if self.info["groupquotabase"].lower() == "group" : 874 base = self.info["groupbase"]873 base = self.info["groupbase"] 875 874 else : 876 base = self.info["groupquotabase"]875 base = self.info["groupquotabase"] 877 876 result = self.doSearch("(&(objectClass=pykotaGroupPQuota)(pykotaPrinterName=%s)(|%s))" % \ 878 877 (pname, "".join(["(pykotaGroupName=%s)" % gname for gname in names])), \ -
pykota/trunk/pykota/storages/mysqlstorage.py
r2821 r2830 26 26 import time 27 27 28 from pykota.storage import PyKotaStorageError, BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota28 from pykota.storage import PyKotaStorageError, BaseStorage 29 29 from pykota.storages.sql import SQLStorage 30 30 -
pykota/trunk/pykota/storages/pgstorage.py
r2773 r2830 26 26 from types import StringType 27 27 28 from pykota.storage import PyKotaStorageError, BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota28 from pykota.storage import PyKotaStorageError, BaseStorage 29 29 from pykota.storages.sql import SQLStorage 30 30 -
pykota/trunk/pykota/storages/sqlitestorage.py
r2773 r2830 25 25 import time 26 26 27 from pykota.storage import PyKotaStorageError, BaseStorage,StorageObject,StorageUser,StorageGroup,StoragePrinter,StorageJob,StorageLastJob,StorageUserPQuota,StorageGroupPQuota27 from pykota.storage import PyKotaStorageError, BaseStorage 28 28 from pykota.storages.sql import SQLStorage 29 29 -
pykota/trunk/pykota/storages/sql.py
r2787 r2830 23 23 # 24 24 25 from pykota.storage import PyKotaStorageError, BaseStorage, StorageObject, \ 26 StorageUser, StorageGroup, StoragePrinter, \ 25 from pykota.storage import StorageUser, StorageGroup, StoragePrinter, \ 27 26 StorageJob, StorageLastJob, StorageUserPQuota, \ 28 27 StorageGroupPQuota, StorageBillingCode