Convert to python3

dtmilano · dtmilano · commit 381ccdbf0710 · 2019-11-15T23:06:43.000-08:00
- String encoding
- print function
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -149,7 +149,7 @@ def toCommandName(operation):
 class Culebron:
     APPLICATION_NAME = "Culebra"
 
-    UPPERCASE_CHARS = string.uppercase[:26]
+    UPPERCASE_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
     KEYSYM_TO_KEYCODE_MAP = {
         'Home': 'HOME',
diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py
@@ -1108,7 +1108,9 @@ def writeImageToFile(self, filename, _format="PNG"):
         image.crop(box).save(filename, _format)
 
     def __smallStr__(self):
-        __str = str("View[", 'utf-8', 'replace')
+        #2to3
+        #__str = str("View[", 'utf-8', 'replace')
+        __str = "View["
         if "class" in self.map:
             __str += " class=" + self.map['class']
         __str += " id=%s" % self.getId()
@@ -1121,7 +1123,9 @@ def __smallStr__(self):
         return __str
 
     def __tinyStr__(self):
-        __str = str("View[", 'utf-8', 'replace')
+        #2to3
+        #__str = str("View[", 'utf-8', 'replace')
+        __str = "View["
         if "class" in self.map:
             __str += " class=" + re.sub('.*\.', '', self.map['class'])
         __str += " id=%s" % self.getId()
@@ -1130,7 +1134,9 @@ def __tinyStr__(self):
         return __str
 
     def __microStr__(self):
-        __str = str('', 'utf-8', 'replace')
+        #2to3
+        #__str = str('', 'utf-8', 'replace')
+        __str = ''
         if "class" in self.map:
             __str += re.sub('.*\.', '', self.map['class'])
         _id = self.getId().replace('id/no_id/', '-')
@@ -1142,7 +1148,9 @@ def __microStr__(self):
         return __str
 
     def __str__(self):
-        __str = "View[" + 'utf-8' + 'replace'
+        #2to3
+        #__str = "View[" + 'utf-8' + 'replace'
+        __str = "View["
 
         if "class" in self.map:
             __str += " class=" + self.map["class"].__str__() + " "
diff --git a/tools/culebra b/tools/culebra
