| 1 |
commit: 712ead9247833548922d2e79b86db861ba81d302 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 15 23:56:46 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 15 23:56:46 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=712ead92 |
| 7 |
|
| 8 |
Drop CATEGORY from package metadata. |
| 9 |
|
| 10 |
Please use .atom.key.category instead. |
| 11 |
|
| 12 |
--- |
| 13 |
gentoopm/basepm/metadata.py | 5 +---- |
| 14 |
gentoopm/paludispm/pkg.py | 4 ---- |
| 15 |
gentoopm/portagepm/pkg.py | 7 +------ |
| 16 |
gentoopm/tests/pkg.py | 2 +- |
| 17 |
4 files changed, 3 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/gentoopm/basepm/metadata.py b/gentoopm/basepm/metadata.py |
| 20 |
index 79e2495..f36f310 100644 |
| 21 |
--- a/gentoopm/basepm/metadata.py |
| 22 |
+++ b/gentoopm/basepm/metadata.py |
| 23 |
@@ -18,10 +18,7 @@ metadata_keys = ( |
| 24 |
'RESTRICT', 'PROPERTIES', |
| 25 |
'REQUIRED_USE', |
| 26 |
# magic ebuild-defined vars (PMS 7.4) |
| 27 |
- 'INHERITED', 'DEFINED_PHASES', |
| 28 |
- |
| 29 |
- # other useful ebuild vars |
| 30 |
- 'CATEGORY' |
| 31 |
+ 'INHERITED', 'DEFINED_PHASES' |
| 32 |
) |
| 33 |
""" A common supported metadata key list. """ |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py |
| 37 |
index e127cd4..439e1fa 100644 |
| 38 |
--- a/gentoopm/paludispm/pkg.py |
| 39 |
+++ b/gentoopm/paludispm/pkg.py |
| 40 |
@@ -55,7 +55,3 @@ class PaludisMetadata(PMPackageMetadata): |
| 41 |
raise NotImplementedError('Parsing %s is not supported yet.' % key) |
| 42 |
else: |
| 43 |
return str(m) |
| 44 |
- |
| 45 |
- @property |
| 46 |
- def CATEGORY(self): |
| 47 |
- return str(self._pkg.name.category) |
| 48 |
|
| 49 |
diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py |
| 50 |
index fdf1414..b084dbc 100644 |
| 51 |
--- a/gentoopm/portagepm/pkg.py |
| 52 |
+++ b/gentoopm/portagepm/pkg.py |
| 53 |
@@ -3,8 +3,7 @@ |
| 54 |
# (c) 2011 Michał Górny <mgorny@g.o> |
| 55 |
# Released under the terms of the 2-clause BSD license. |
| 56 |
|
| 57 |
-from portage.versions import cpv_getkey, cpv_getversion, vercmp, \ |
| 58 |
- catsplit |
| 59 |
+from portage.versions import cpv_getkey, cpv_getversion, vercmp |
| 60 |
|
| 61 |
from gentoopm.basepm.metadata import PMPackageMetadata |
| 62 |
from gentoopm.basepm.pkg import PMPackage |
| 63 |
@@ -83,10 +82,6 @@ class PortageDBMetadata(PMPackageMetadata): |
| 64 |
raise AttributeError('Unsupported metadata key: %s' % key) |
| 65 |
return self._dbapi.aux_get(self._cpv, [key])[0] |
| 66 |
|
| 67 |
- @property |
| 68 |
- def CATEGORY(self): |
| 69 |
- return catsplit(self._cpv)[0] |
| 70 |
- |
| 71 |
class PortageMetadata(PortageDBMetadata): |
| 72 |
def __init__(self, cpv, dbapi, tree): |
| 73 |
PortageDBMetadata.__init__(self, cpv, dbapi) |
| 74 |
|
| 75 |
diff --git a/gentoopm/tests/pkg.py b/gentoopm/tests/pkg.py |
| 76 |
index b57ff93..ccd90a9 100644 |
| 77 |
--- a/gentoopm/tests/pkg.py |
| 78 |
+++ b/gentoopm/tests/pkg.py |
| 79 |
@@ -50,7 +50,7 @@ class PackagesTestCase(PMTestCase): |
| 80 |
|
| 81 |
def test_metadata_dict_attr(self): |
| 82 |
""" Check whether metadata is accessible with dict & attrs. """ |
| 83 |
- mks = ('EAPI', 'INHERITED', 'DESCRIPTION', 'CATEGORY') |
| 84 |
+ mks = ('EAPI', 'INHERITED', 'DESCRIPTION') |
| 85 |
for p in self._pkgs: |
| 86 |
for k in mks: |
| 87 |
self.assertEqual(p.metadata[k], getattr(p.metadata, k)) |
Archives