aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-12-25 12:38:17 -0800
committerBrian Dolbec <dolsen@gentoo.org>2014-12-25 12:38:17 -0800
commit26352316808100b05b5504b69ed8d1b22053ddb2 (patch)
tree908c86088ca735044f503f2d273fafe829cedb1a /gkeys/gkeys/base.py
parentgkeys/SaneConfigParser: Fix py3 imports (diff)
downloadgentoo-keys-26352316808100b05b5504b69ed8d1b22053ddb2.tar.gz
gentoo-keys-26352316808100b05b5504b69ed8d1b22053ddb2.tar.bz2
gentoo-keys-26352316808100b05b5504b69ed8d1b22053ddb2.zip
gkeys/base.py: Py3 compatibility fix
Diffstat (limited to 'gkeys/gkeys/base.py')
-rw-r--r--gkeys/gkeys/base.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index e7dd710..5ad92e7 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -15,11 +15,16 @@ from __future__ import print_function
import argparse
+import sys
from gkeys import config, fileops, seed, lib
from gkeys.log import log_levels, set_logger
+if sys.version_info[0] >= 3:
+ unicode = str
+
+
class CliBase(object):
'''Common cli and argsparse options class'''
@@ -246,7 +251,7 @@ class CliBase(object):
if header:
print(header)
for msg in results:
- if isinstance(msg, str) or isinstance(msg, unicode):
+ if type(msg) in [str, unicode]:
print(' ', msg)
else:
try: