Add six to the requirements, use it's text_type

MeirKriheli · MeirKriheli · commit 44b86cfdd187 · 2014-08-09T21:20:07.000+03:00
diff --git a/bidi/algorithm.py b/bidi/algorithm.py
@@ -16,12 +16,15 @@
 # Copyright (C) 2008-2010 Yaacov Zamir <kzamir_a_walla.co.il>,
 # Meir kriheli <meir@mksoft.co.il>
 "bidirectional alogrithm implementation"
+import sys
 
-from unicodedata import bidirectional, mirrored
 import inspect
-import sys
 from collections import deque
-from mirror import MIRRORED
+from unicodedata import bidirectional, mirrored
+import six
+
+from .mirror import MIRRORED
+
 
 # Some definitions
 PARAGRAPH_LEVELS = { 'L':0, 'AL':1, 'R': 1 }
@@ -38,8 +41,8 @@
 }
 
 # Added 'B' so X6 won't execute in that case and X8 will run it's course
-X6_IGNORED = X2_X5_MAPPINGS.keys() + ['BN', 'PDF', 'B']
-X9_REMOVED = X2_X5_MAPPINGS.keys() + ['BN', 'PDF']
+X6_IGNORED = list(X2_X5_MAPPINGS.keys()) + ['BN', 'PDF', 'B']
+X9_REMOVED = list(X2_X5_MAPPINGS.keys()) + ['BN', 'PDF']
 
 _embedding_direction = lambda x:('L', 'R')[x % 2]
 
@@ -597,7 +600,7 @@ def get_display(unicode_or_str, encoding='utf-8', upper_is_rtl=False,
     storage = get_empty_storage()
 
     # utf-8 ? we need unicode
-    if isinstance(unicode_or_str, unicode):
+    if isinstance(unicode_or_str, six.string_types):
         text = unicode_or_str
         decoded = False
     else:
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
 requirements = [
-    # TODO: put package requirements here
+    'six'
 ]
 
 test_requirements = [

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`history = open('HISTORY.rst').read().replace('.. :changelog:', '')`
`12`	`12`
`13`	`13`	`requirements = [`
`14`		`- # TODO: put package requirements here`
	`14`	`+ 'six'`
`15`	`15`	`]`
`16`	`16`
`17`	`17`	`test_requirements = [`