From 4b72a89379a3622902c8d47ff4ab32f2551a50ac Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Thu, 28 Dec 2017 23:25:09 +0100
Subject: [PATCH] There were a few bugs in the previous commit

---
 jedi/evaluate/syntax_tree.py | 8 ++++++--
 test/run.py                  | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py
index 512efbf4..a6764a42 100644
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -5,7 +5,7 @@ import copy
 
 from parso.python import tree
 
-from jedi._compatibility import force_unicode
+from jedi._compatibility import force_unicode, unicode
 from jedi import debug
 from jedi import parser_utils
 from jedi.evaluate.base_context import ContextSet, NO_CONTEXTS, ContextualizedNode, \
@@ -368,7 +368,11 @@ def _bool_to_context(evaluator, bool_):
 def _eval_comparison_part(evaluator, context, left, operator, right):
     l_is_num = is_number(left)
     r_is_num = is_number(right)
-    str_operator = force_unicode(str(operator.value))
+    if isinstance(operator, unicode):
+        str_operator = operator
+    else:
+        str_operator = force_unicode(str(operator.value))
+
     if str_operator == '*':
         # for iterables, ignore * operations
         if isinstance(left, iterable.AbstractIterable) or is_string(left):
diff --git a/test/run.py b/test/run.py
index 064114ad..20119f99 100755
--- a/test/run.py
+++ b/test/run.py
@@ -125,6 +125,7 @@ from jedi._compatibility import unicode, is_py3
 from jedi.api.classes import Definition
 from jedi.api.completion import get_user_scope
 from jedi import parser_utils
+from jedi.api.environment import get_default_environment
 
 
 TEST_COMPLETIONS = 0
@@ -432,11 +433,12 @@ if __name__ == '__main__':
                   % (case.line_nr - 1, actual, desired))
             return 1
 
+    environment = get_default_environment()
     import traceback
     current = cases[0].path if cases else None
     count = fails = 0
     for c in cases:
-        if c.get_skip_reason():
+        if c.get_skip_reason(environment):
             continue
         if current != c.path:
             file_change(current, count, fails)
@@ -444,7 +446,7 @@ if __name__ == '__main__':
             count = fails = 0
 
         try:
-            if c.run(report):
+            if c.run(report, environment):
                 tests_fail += 1
                 fails += 1
         except Exception: