From 43f875e18c0858ca4573c0b7f3edb63119d51e1b Mon Sep 17 00:00:00 2001 From: Abhas Bhattacharya Date: Thu, 24 Dec 2015 12:49:59 +0530 Subject: [PATCH] Non travis env and py3 no-unicode fix --- pytest_gui_status/status_plugin/plugin.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pytest_gui_status/status_plugin/plugin.py b/pytest_gui_status/status_plugin/plugin.py index 4d02aec..5f3b966 100644 --- a/pytest_gui_status/status_plugin/plugin.py +++ b/pytest_gui_status/status_plugin/plugin.py @@ -14,7 +14,7 @@ if env_redis_port: else: REDIS_PORT = 5946 -if os.environ["TRAVIS"] == "true": +if os.environ.get("TRAVIS") == "true": command_redis_server_gen = "redis-server --port {port}" else: command_redis_server_gen = "redis-server --port {port} --maxheap 20MB" @@ -42,17 +42,20 @@ def s(input_): If list, do it for all of them. If others, return as is. ''' + import sys + PY3 = sys.version_info > (3,) + if hasattr(input_, "__iter__"): return [s(ele) for ele in input_] try: - assert(type(input_) in [str, unicode, bytes]) + if PY3: + assert(type(input_) in [str, unicode, bytes]) + else: + assert(type(input_) in [str, bytes]) except AssertionError: return input_ - import sys - PY3 = sys.version_info > (3,) - if PY3: if type(input_) == bytes: str_ = bytes.decode(input_)