diff options
| author | Florian Weimer <fw@deneb.enyo.de> | 2010-05-07 21:14:52 +0000 |
|---|---|---|
| committer | Florian Weimer <fw@deneb.enyo.de> | 2010-05-07 21:14:52 +0000 |
| commit | 29a4c249241a6bf2e710c576a43f1b796c95dcb2 (patch) | |
| tree | 7791400ca24f7b0136c23cb24b033378fb3d125d /lib | |
| parent | ef39525070805d9b1e2f0aef1581153c86bea3d8 (diff) | |
sectracker.xcollections: renamed from xcollections
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@14632 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/parsers.py | 16 | ||||
| -rw-r--r-- | lib/python/sectracker/diagnostics.py | 4 | ||||
| -rw-r--r-- | lib/python/sectracker/xcollections.py (renamed from lib/python/xcollections.py) | 0 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/python/parsers.py b/lib/python/parsers.py index a392828366..40f1dbefc9 100644 --- a/lib/python/parsers.py +++ b/lib/python/parsers.py @@ -20,7 +20,7 @@ import re import debian_support import sectracker.regexpcase as _regexpcase -import xcollections +from sectracker.xcollections import namedtuple as _namedtuple import xpickle import sectracker.diagnostics @@ -69,11 +69,11 @@ def _sortedtuple(seq): l.sort() return tuple(l) -FlagAnnotation = xcollections.namedtuple("FlagAnnotation", "line type") -StringAnnotation = xcollections.namedtuple("StringAnnotation", +FlagAnnotation = _namedtuple("FlagAnnotation", "line type") +StringAnnotation = _namedtuple("StringAnnotation", "line type description") -XrefAnnotation = xcollections.namedtuple("XrefAnnotation", "line type bugs") -PackageAnnotation = xcollections.namedtuple( +XrefAnnotation = _namedtuple("XrefAnnotation", "line type bugs") +PackageAnnotation = _namedtuple( "PackageAnnotation", "line type release package kind version description " + "urgency debian_bugs bug_filed") @@ -180,9 +180,9 @@ def _annotationdispatcher(): diag.error("invalid annotation")) _annotationdispatcher = _annotationdispatcher() -List = xcollections.namedtuple("List", "list messages") -Bug = xcollections.namedtuple("Bug", "file header annotations") -Header = xcollections.namedtuple("Header", "line name description") +List = _namedtuple("List", "list messages") +Bug = _namedtuple("Bug", "file header annotations") +Header = _namedtuple("Header", "line name description") def _cveuniquename(line, anns): bug = 0 diff --git a/lib/python/sectracker/diagnostics.py b/lib/python/sectracker/diagnostics.py index 635358cf88..990f02e699 100644 --- a/lib/python/sectracker/diagnostics.py +++ b/lib/python/sectracker/diagnostics.py @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import xcollections +from sectracker.xcollections import namedtuple as _namedtuple -Message = xcollections.namedtuple("Message", "file line level message") +Message = _namedtuple("Message", "file line level message") def _checkfile(file): if not isinstance(file, basestring): diff --git a/lib/python/xcollections.py b/lib/python/sectracker/xcollections.py index cf7528ad5b..cf7528ad5b 100644 --- a/lib/python/xcollections.py +++ b/lib/python/sectracker/xcollections.py |