From d6c0023796712adbe441d00ba7ea73a4cc0ea669 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 28 Apr 2017 13:45:46 +0300 Subject: [PATCH] Ran 2to3 on pysollib/[a-m]*.py --- pysollib/mfxutil.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index ecfe4f18..35ab1229 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -40,17 +40,9 @@ import time import types import locale import webbrowser +from six import print_ - -try: - from cPickle import Pickler, Unpickler, UnpicklingError -except ImportError: - from pickle import Pickler, Unpickler, UnpicklingError - -try: - import thread -except: - thread = None +from pickle import Pickler, Unpickler, UnpicklingError from pysollib.settings import PACKAGE, TOOLKIT @@ -123,7 +115,7 @@ def print_err(s, level=1): ss = PACKAGE+': WARNING:' elif level == 2: ss = PACKAGE+': DEBUG WARNING:' - print >> sys.stderr, ss, s.encode(locale.getpreferredencoding()) + print_(ss, s.encode(locale.getpreferredencoding()), file=sys.stderr) sys.stderr.flush()