Use bytes in pack_value() methods, replace atoi() with int().

vasily-v-ryabov · vasily-v-ryabov · commit f959838b27ab · 2016-03-25T23:14:10.000+03:00
diff --git a/Xlib/protocol/rq.py b/Xlib/protocol/rq.py
@@ -390,7 +390,7 @@ def pack_value(self, val):
         slen = len(val)
 
         if self.pad:
-            return val + '\0' * ((4 - slen % 4) % 4), slen, None
+            return val + b'\0' * ((4 - slen % 4) % 4), slen, None
         else:
             return val, slen, None
 
@@ -421,9 +421,9 @@ def pack_value(self, val):
         slen = len(val)
 
         if self.pad:
-            pad = '\0\0' * (slen % 2)
+            pad = b'\0\0' * (slen % 2)
         else:
-            pad = ''
+            pad = b''
 
         return struct.pack(*('>' + 'H' * slen, ) + tuple(val)) + pad, slen, None
 
@@ -526,11 +526,11 @@ def pack_value(self, val):
             for v in val:
                 data.append(self.type.pack_value(v))
 
-            data = ''.join(data)
+            data = b''.join(data)
 
         if self.pad:
             dlen = len(data)
-            data = data + '\0' * ((4 - dlen % 4) % 4)
+            data = data + b'\0' * ((4 - dlen % 4) % 4)
 
         return data, len(val), None
 
@@ -641,9 +641,9 @@ def pack_value(self, value):
             vlen = len(val)
             if vlen % size:
                 vlen = vlen - vlen % size
-                data = val[:vlen]
+                data = val[:vlen].encode()
             else:
-                data = val
+                data = val.encode()
 
             dlen = vlen // size
 
@@ -656,7 +656,7 @@ def pack_value(self, value):
             dlen = len(val)
 
         dl = len(data)
-        data = data + '\0' * ((4 - dl % 4) % 4)
+        data = data + b'\0' * ((4 - dl % 4) % 4)
 
         return data, dlen, fmt
 
@@ -699,7 +699,7 @@ def __init__(self, name, mask, pad, *fields):
 
     def pack_value(self, arg, keys):
         mask = 0
-        data = ''
+        data = b''
 
         if arg == self.default:
             arg = keys
@@ -713,7 +713,7 @@ def pack_value(self, arg, keys):
                     val = field.check_value(val)
 
                 d = struct.pack('=' + field.structcode, val)
-                data = data + d + '\0' * (4 - len(d))
+                data = data + d + b'\0' * (4 - len(d))
 
         return struct.pack(self.maskcode, mask) + data, None, None
 
@@ -1174,7 +1174,7 @@ class TextElements8(ValueField):
                               String8('string', pad = 0) )
 
     def pack_value(self, value):
-        data = ''
+        data = b''
         args = {}
 
         for v in value:
@@ -1213,7 +1213,7 @@ def pack_value(self, value):
 
         # Pad out to four byte length
         dlen = len(data)
-        return data + '\0' * ((4 - dlen % 4) % 4), None, None
+        return data + b'\0' * ((4 - dlen % 4) % 4), None, None
 
     def parse_binary_value(self, data, display, length, format):
         values = []
diff --git a/Xlib/rdb.py b/Xlib/rdb.py
@@ -22,7 +22,6 @@
 
 
 # Standard modules
-import locale
 import re
 import sys
 
@@ -121,7 +120,7 @@ def insert_string(self, data):
             for i in range(1, len(splits), 2):
                 s = splits[i]
                 if len(s) == 3:
-                    splits[i] = chr(locale.atoi(s, 8))
+                    splits[i] = chr(int(s, 8))
                 elif s == 'n':
                     splits[i] = '\n'
 
diff --git a/Xlib/support/unix_connect.py b/Xlib/support/unix_connect.py
@@ -17,7 +17,6 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 import re
-import locale
 import os
 import platform
 import socket
@@ -153,7 +152,7 @@ def old_get_auth(sock, dname, host, dno):
 
                 # Translate hexcode into binary
                 for i in range(0, len(hexauth), 2):
-                    auth = auth + chr(locale.atoi(hexauth[i:i+2], 16))
+                    auth = auth + chr(int(hexauth[i:i+2], 16))
 
                 auth_data = auth
     except os.error:
diff --git a/Xlib/xobject/colormap.py b/Xlib/xobject/colormap.py
@@ -22,7 +22,6 @@
 import resource
 
 import re
-import locale
 
 rgb_res = [
     re.compile(r'\Argb:([0-9a-fA-F]{1,4})/([0-9a-fA-F]{1,4})/([0-9a-fA-F]{1,4})\Z'),
@@ -73,13 +72,13 @@ def alloc_named_color(self, name):
             m = r.match(name)
             if m:
                 rs = m.group(1)
-                r = locale.atoi(rs + '0' * (4 - len(rs)), 16)
+                r = int(rs + '0' * (4 - len(rs)), 16)
 
                 gs = m.group(2)
-                g = locale.atoi(gs + '0' * (4 - len(gs)), 16)
+                g = int(gs + '0' * (4 - len(gs)), 16)
 
                 bs = m.group(3)
-                b = locale.atoi(bs + '0' * (4 - len(bs)), 16)
+                b = int(bs + '0' * (4 - len(bs)), 16)
 
                 return self.alloc_color(r, g, b)
 
