From e428c5b4a80f4a7dd3dc509d39d3b9f12d6aeff2 Mon Sep 17 00:00:00 2001 From: Brian May Date: Tue, 5 Mar 2019 17:41:31 +1100 Subject: Replace cPickle with pickle library cPickle isn't available in Python 3. --- lib/python/sectracker/xpickle.py | 2 +- lib/python/security_db.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/python/sectracker/xpickle.py b/lib/python/sectracker/xpickle.py index 78a8e95075..32657f15e3 100644 --- a/lib/python/sectracker/xpickle.py +++ b/lib/python/sectracker/xpickle.py @@ -19,7 +19,7 @@ from __future__ import with_statement import errno as _errno import os as _os -import cPickle as _pickle +import pickle as _pickle import tempfile as _tempfile EXTENSION = '.xpck' diff --git a/lib/python/security_db.py b/lib/python/security_db.py index a59e0430ed..5c1d49cf17 100644 --- a/lib/python/security_db.py +++ b/lib/python/security_db.py @@ -32,7 +32,7 @@ import apsw import base64 import bugs from collections import namedtuple -import cPickle +import pickle import cStringIO import glob import itertools @@ -698,14 +698,14 @@ class DB: def toString(data): result = cStringIO.StringIO() - cPickle.dump(data, result) + pickle.dump(data, result) return buffer(result.getvalue()) for (old_print, contents) in cursor.execute( "SELECT inodeprint, parsed FROM inodeprints WHERE file = ?", (filename,)): if old_print == current_print: - return (True, cPickle.load(cStringIO.StringIO(contents))) + return (True, pickle.load(cStringIO.StringIO(contents))) result = do_parse(debian_support.PackageFile(filename)) cursor.execute("""UPDATE inodeprints SET inodeprint = ?, parsed = ? WHERE file = ?""", (current_print, toString(result), filename)) -- cgit v1.2.3