From bde58b19a3ad66c83391831c0a4b2fa07f67cefa Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 1 Aug 2010 00:43:48 +0200 Subject: [PATCH] [entropy.db] EntropyRepository: remove @deprecated methods --- docs/TODO | 2 - libraries/entropy/db/__init__.py | 70 -------------------------------- 2 files changed, 72 deletions(-) diff --git a/docs/TODO b/docs/TODO index a7e212a0f..80ce8d91f 100644 --- a/docs/TODO +++ b/docs/TODO @@ -9,7 +9,6 @@ - make sure that every equo command properly uses entropy locks smart, security, cache, repositories? - - remove @deprecated in entropy.db - uniform config files options to this-and-that (keeping backward compat) alternatively use "=" instead of "|" - reagent/activator, do not use stuff like server_reagent.Entropy.blah() @@ -17,7 +16,6 @@ - Client.urlFetcher/MultipleUrlFetcher/clientLog? ugly! - entropy.db.search* unittest - entropy package metadata .dtd specs - - entropy.db: remove @deprecated methods - entropy.client API docs 1.1: diff --git a/libraries/entropy/db/__init__.py b/libraries/entropy/db/__init__.py index 586291fc3..6548ce2b6 100644 --- a/libraries/entropy/db/__init__.py +++ b/libraries/entropy/db/__init__.py @@ -2374,11 +2374,6 @@ class EntropyRepository(EntropyRepositoryBase): return mycounter[0] return -1 - def retrieveMessages(self, package_id): - """ @deprecated """ - warnings.warn("deprecated call!") - return [] - def retrieveSize(self, package_id): """ Reimplemented from EntropyRepositoryBase. @@ -3192,11 +3187,6 @@ class EntropyRepository(EntropyRepositoryBase): return result - def retrieveUnusedIdpackages(self): - """@deprecated""" - warnings.warn("deprecated call!") - return self.retrieveUnusedPackageIds() - def retrieveUnusedPackageIds(self): """ Reimplemented from EntropyRepositoryBase. @@ -3234,11 +3224,6 @@ class EntropyRepository(EntropyRepositoryBase): return False return True - def isIdpackageAvailable(self, package_id): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.isPackageIdAvailable(package_id) - def isPackageIdAvailable(self, package_id): """ Reimplemented from EntropyRepositoryBase. @@ -3452,11 +3437,6 @@ class EntropyRepository(EntropyRepositoryBase): return True return False - def isLicensedataKeyAvailable(self, license_name): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.isLicenseDataKeyAvailable(license_name) - def isLicenseDataKeyAvailable(self, license_name): """ Reimplemented from EntropyRepositoryBase. @@ -3724,11 +3704,6 @@ class EntropyRepository(EntropyRepositoryBase): return iddep[0] return -1 - def searchIdpackageFromIddependency(self, iddep): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.searchPackageIdFromDependencyId(iddep) - def searchPackageIdFromDependencyId(self, dependency_id): """ Reimplemented from EntropyRepositoryBase. @@ -3991,11 +3966,6 @@ class EntropyRepository(EntropyRepositoryBase): """, (repository, from_branch, to_branch,)) return cur.fetchone() - def listIdPackagesInIdcategory(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.listPackageIdsInCategoryId(*args, **kwargs) - def listPackageIdsInCategoryId(self, category_id, order_by = None): """ Reimplemented from EntropyRepositoryBase. @@ -4047,11 +4017,6 @@ class EntropyRepository(EntropyRepositoryBase): cur = self._cursor().execute('SELECT counter, idpackage FROM counters') return cur.fetchall() - def listAllIdpackages(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.listAllPackageIds(*args, **kwargs) - def listAllPackageIds(self, order_by = None): """ Reimplemented from EntropyRepositoryBase. @@ -4403,21 +4368,6 @@ class EntropyRepository(EntropyRepositoryBase): return 1 return 0 - def checkDatabaseApi(self): - """ @deprecated """ - warnings.warn("deprecated call!") - return - - def doDatabaseImport(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.importRepository(*args, **kwargs) - - def doDatabaseExport(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.exportRepository(*args, **kwargs) - def importRepository(self, dumpfile, dbfile): """ Reimplemented from EntropyRepositoryBase. @@ -4694,11 +4644,6 @@ class EntropyRepository(EntropyRepositoryBase): DELETE FROM installedtable WHERE idpackage = (?)""", (package_id,)) - def storeXpakMetadata(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.storeSpmMetadata(*args, **kwargs) - def storeSpmMetadata(self, package_id, blob): """ Reimplemented from EntropyRepositoryBase. @@ -4708,11 +4653,6 @@ class EntropyRepository(EntropyRepositoryBase): ) self.commitChanges() - def retrieveXpakMetadata(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.retrieveSpmMetadata(*args, **kwargs) - def retrieveSpmMetadata(self, package_id): """ Reimplemented from EntropyRepositoryBase. @@ -5038,11 +4978,6 @@ class EntropyRepository(EntropyRepositoryBase): ON eclassesreference ( classname ); """) - def regenerateSpmUidTable(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.regenerateSpmUidTable() - def regenerateSpmUidMapping(self): """ Reimplemented from EntropyRepositoryBase. @@ -5491,8 +5426,3 @@ class EntropyRepository(EntropyRepositoryBase): """, (to_branch,)) self.commitChanges() self.clearCache() - - def idpackageValidator(self, *args, **kwargs): - """ @deprecated """ - warnings.warn("deprecated call!") - return self.maskFilter(*args, **kwargs)