Improve python 3 detection logic

aresch · Jun 14, 2015 · de135dd · aresch · Jun 14, 2015 · jonathanunderwood
1 parent 8b1bf90
commit de135dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/rencode/rencode.pyx b/rencode/rencode.pyx
@@ -24,11 +24,10 @@
 
 import sys
 
-py3 = False
-if sys.version_info.major >= 3:
-    py3 = True
+py3 = sys.version >= '3'
+if py3:
     unicode = str
-    
+
 from cpython cimport bool
 from libc.stdlib cimport realloc, malloc, free
 from libc.string cimport memcpy

diff --git a/rencode/rencode_orig.py b/rencode/rencode_orig.py
@@ -64,18 +64,16 @@
 
 import sys
 
-py3 = False
-if sys.version_info.major >= 3:
-    py3 = True
-    long = int
-    unicode = str
-
-def int2byte(c):
-    if py3:
+py3 = sys.version >= '3'
+if py3:
+    long = int          #@ReservedAssignment
+    unicode = str       #@ReservedAssignment
+    def int2byte(c):
         return bytes([c])
-    else:
+else:
+    def int2byte(c):
         return chr(c)
-       
+
 import struct
 from threading import Lock