summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-06 12:35:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-06 12:35:12 +0000
commit7ef12684e8647b006bf46cae695069d4bfece1cf (patch)
treefd2dba1603b14e0b2e805d54af36d249c84f76a3
parentae6045b84978940c365c95c33d6996359c3e299d (diff)
downloadbitbake-contrib-7ef12684e8647b006bf46cae695069d4bfece1cf.tar.gz
bitbake-contrib-7ef12684e8647b006bf46cae695069d4bfece1cf.tar.bz2
bitbake-contrib-7ef12684e8647b006bf46cae695069d4bfece1cf.zip
prserv/persist_data/utils: Drop obsolete python2 imports
These imports were from python 2.6 and earlier, 2.4 in some cases. Drop them since we're all python3 now. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/persist_data.py6
-rw-r--r--lib/bb/utils.py22
-rw-r--r--lib/prserv/serv.py7
3 files changed, 7 insertions, 28 deletions
diff --git a/lib/bb/persist_data.py b/lib/bb/persist_data.py
index e6bbff88ea..bef7018614 100644
--- a/lib/bb/persist_data.py
+++ b/lib/bb/persist_data.py
@@ -28,11 +28,7 @@ import sys
import warnings
from bb.compat import total_ordering
from collections import Mapping
-
-try:
- import sqlite3
-except ImportError:
- from pysqlite2 import dbapi2 as sqlite3
+import sqlite3
sqlversion = sqlite3.sqlite_version_info
if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index a22a05e241..2845126293 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -523,12 +523,8 @@ def md5_file(filename):
"""
Return the hex string representation of the MD5 checksum of filename.
"""
- try:
- import hashlib
- m = hashlib.md5()
- except ImportError:
- import md5
- m = md5.new()
+ import hashlib
+ m = hashlib.md5()
with open(filename, "rb") as f:
for line in f:
@@ -538,14 +534,9 @@ def md5_file(filename):
def sha256_file(filename):
"""
Return the hex string representation of the 256-bit SHA checksum of
- filename. On Python 2.4 this will return None, so callers will need to
- handle that by either skipping SHA checks, or running a standalone sha256sum
- binary.
+ filename.
"""
- try:
- import hashlib
- except ImportError:
- return None
+ import hashlib
s = hashlib.sha256()
with open(filename, "rb") as f:
@@ -557,10 +548,7 @@ def sha1_file(filename):
"""
Return the hex string representation of the SHA1 checksum of the filename
"""
- try:
- import hashlib
- except ImportError:
- return None
+ import hashlib
s = hashlib.sha1()
with open(filename, "rb") as f:
diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py
index d9b602f14c..a7efa58bc7 100644
--- a/lib/prserv/serv.py
+++ b/lib/prserv/serv.py
@@ -5,12 +5,7 @@ import threading
import queue
import socket
import io
-
-try:
- import sqlite3
-except ImportError:
- from pysqlite2 import dbapi2 as sqlite3
-
+import sqlite3
import bb.server.xmlrpc
import prserv
import prserv.db