freewvs.git

@@ -85,7 +85,7 @@ if not jdir:

 jconfig = []

 for cfile in glob.glob(jdir + '/*.json'):

-    with open(cfile) as json_file:

+    with open(cfile, encoding="ascii") as json_file:

         data = json.load(json_file)

         jconfig += data

@@ -115,7 +115,8 @@ for fdir in opts.dirs:

                     if filename == det['file']:

                         mfile = os.path.join(root, filename)

                         try:

-                            file = open(mfile, errors='replace')

+                            file = open(mfile, encoding='ascii',

+                                        errors='replace')

                         except OSError:

                             continue

                         filestr = file.read(200000)

@@ -146,7 +147,7 @@ for fdir in opts.dirs:

                                                   + int(det['add_minor']))

                             findversion = '.'.join(findversion)

-                        if ((not versioncompare(item['safe'], findversion))

+                        if (not versioncompare(item['safe'], findversion)

                                 or ('old_safe' in item

                                     and findversion in

                                     item['old_safe'].split(','))):

@@ -4,7 +4,8 @@ import os

 import setuptools

 import setuptools.command.install

-f = open(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md'))

+f = open(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'README.md'),

+         encoding="ascii")

 readme = f.read()

 f.close()

@@ -33,7 +33,7 @@ class TestFreewvsData(unittest.TestCase):

                                    stdout=subprocess.PIPE, check=True)

             fwdata = re.sub(tmp, "[dir]", fwrun.stdout.decode("utf-8"))

             fwclean = re.sub(r' \(.* ', " ", fwdata)

-            f = open(tdir + "/refdata-a.txt")

+            f = open(tdir + "/refdata-a.txt", encoding="ascii")

             refdata = f.read()

             f.close()

             refclean = re.sub(r' \(.* ', " ", refdata)

@@ -19,7 +19,7 @@ class TestJsonLint(unittest.TestCase):

     def test_json_lint(self):

         valid = True

         for f in glob.glob("freewvsdb/*.json"):

-            fp = open(f)

+            fp = open(f, encoding="ascii")

             orig = fp.read()

             fp.close()

             tmp = json.loads(orig)

@@ -33,7 +33,7 @@ class TestJsonLint(unittest.TestCase):

     def test_json_values(self):

         jconfig = []

         for cfile in glob.glob('freewvsdb/*.json'):

-            with open(cfile) as json_file:

+            with open(cfile, encoding="ascii") as json_file:

                 jconfig += json.load(json_file)

         mkeys = {'name', 'url', 'safe', 'vuln', 'detection'}

@@ -27,7 +27,7 @@ if not target:

 old = 0

 if os.path.isfile(target + "timestamp"):

-    with open(target + "timestamp") as f:

+    with open(target + "timestamp", encoding="ascii") as f:

         old = int(f.read())

 new = int(urllib.request.urlopen(DBURL + "freewvsdb.timestamp").read())

@@ -40,5 +40,5 @@ tarball = urllib.request.urlopen(DBURL + str(new) + ".tar.xz").read()

 tf = tarfile.open(fileobj=io.BytesIO(tarball))

 tf.extractall(path=target)

-with open(target + "timestamp", "w") as f:

+with open(target + "timestamp", "w", encoding="ascii") as f:

     f.write(str(new))