[Git][security-tracker-team/security-tracker][master] 5 commits: sectracker.diagnostics: use isstring for py3 compatibility

[Emilio Pozuelo Monfort]

Emilio Pozuelo Monfort pushed to branch master at Debian Security Tracker / security-tracker


Commits:
f7fc8710 by Emilio Pozuelo Monfort at 2020-08-05T21:23:25+02:00
sectracker.diagnostics: use isstring for py3 compatibility

- - - - -
11e066b1 by Emilio Pozuelo Monfort at 2020-08-05T21:23:25+02:00
security_db: don't use cmp to compare versions

- - - - -
e9733ca1 by Emilio Pozuelo Monfort at 2020-08-05T21:23:25+02:00
sectracker.xpickle: open file in binary mode

- - - - -
05cf5406 by Emilio Pozuelo Monfort at 2020-08-05T21:23:25+02:00
sectracker.repo: use standard json module

- - - - -
55bfdd81 by Emilio Pozuelo Monfort at 2020-08-05T21:23:25+02:00
sectracker.parsers: fix intern under py3

- - - - -


5 changed files:

- lib/python/sectracker/diagnostics.py
- lib/python/sectracker/parsers.py
- lib/python/sectracker/repo.py
- lib/python/sectracker/xpickle.py
- lib/python/security_db.py


Changes:

=====================================
lib/python/sectracker/diagnostics.py
=====================================
@@ -17,10 +17,12 @@
 
 from collections import namedtuple as _namedtuple
 
+from helpers import isstring
+
 Message = _namedtuple("Message", "file line level message")
 
 def _checkfile(file):
-    if not isinstance(file, basestring):
+    if not isstring(file):
         raise ValueError("file name is not a string: " + repr(file))
     return file
 


=====================================
lib/python/sectracker/parsers.py
=====================================
@@ -17,6 +17,11 @@
 
 import re
 
+try:
+    from sys import intern
+except:
+    pass
+
 import debian_support
 import sectracker.regexpcase as _regexpcase
 from collections import namedtuple as _namedtuple


=====================================
lib/python/sectracker/repo.py
=====================================
@@ -18,9 +18,9 @@
 from __future__ import with_statement
 
 import bz2 as _bz2
-import cjson as _cjson
 import hashlib as _hashlib
 import gzip as _gzip
+import json
 import os as _os
 import re as _re
 import tempfile as _tempfile
@@ -256,7 +256,7 @@ class RepoCollection(object):
 class Config(object):
     def __init__(self, config, root):
         with open(config) as f:
-            self.config = _cjson.decode(f.read())
+            self.config = json.load(f)
         self.repositories = self.config["repositories"]
         self.distributions = self.config["distributions"]
         self.releases = {}


=====================================
lib/python/sectracker/xpickle.py
=====================================
@@ -42,7 +42,7 @@ def replacefile(path, action):
     replacing it.  The return value is the value returned by the action."""
     t_fd, t_name = _tempfile.mkstemp(suffix='.tmp', dir=_os.path.dirname(path))
     try:
-        t = _os.fdopen(t_fd, "w")
+        t = _os.fdopen(t_fd, "wb")
         try:
             result = action(t_name, t)
         finally:


=====================================
lib/python/security_db.py
=====================================
@@ -2070,10 +2070,8 @@ class DB:
             AND sp.release = binary_packages.release
             AND sp.archive = binary_packages.archive
             AND sp.version <> binary_packages.source_version"""):
-            relation = cmp(debian_support.Version(version),
-                           debian_support.Version(source_version))
-            assert relation != 0
-            if relation <= 0:
+            assert debian_support.Version(version) != debian_support.Version(source_version)
+            if debian_support.Version(version) <= debian_support.Version(source_version):
                 print("error: binary package is older than source package")
             else:
                 print("warning: binary package is newer than source package")



View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/293f74f63831549fd8ec80e1b50229b2e8fac54d...55bfdd8198faf54daf1f2602d7b49e31d3ee97fd

-- 
View it on GitLab: https://salsa.debian.org/security-tracker-team/security-tracker/-/compare/293f74f63831549fd8ec80e1b50229b2e8fac54d...55bfdd8198faf54daf1f2602d7b49e31d3ee97fd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-security-tracker-commits/attachments/20200805/daf67049/attachment-0001.html>