make sms_utilities py3 friendly [part 2 of more]

Summary:
python3 happiness and a version bump

Depends on D4799715

Differential Revision: D4800063

fbshipit-source-id: 588f78d43207eccd81986b6e91b5b7af16ebc843

sms_utilities/requirements.txt

@@ -1 +1 @@
-smspdu==1.0
+smspdu==1.1

sms_utilities/setup.py

@@ -19,7 +19,7 @@
     readme = f.read()
 
 github_url = 'https://github.com/facebookincubator/CommunityCellularManager/sms_utilities'
-version = '0.0.3'
+version = '0.0.4'
 download_url = '%s/%s' % (github_url, version)
 
 setup(

sms_utilities/sms_utilities/SMS_Deliver.py

@@ -13,7 +13,7 @@
 
 from smspdu import SMS_DELIVER
 
-import SMS_Helper
+from . import SMS_Helper
 
 
 def gen_tpdu(ref, to, fromm, text, empty):
@@ -58,4 +58,4 @@ def gen_msg(to, fromm, text, empty=False):
     if len(sys.argv) > 2:
         to = sys.argv[1]
         msg = sys.argv[2]
-    print gen_msg(to, fromm, msg)
+    print(gen_msg(to, fromm, msg))

sms_utilities/sms_utilities/SMS_Helper.py

@@ -40,7 +40,7 @@ def encode_num(num):
 
 
 def clean(s):
-    if isinstance(s, basestring):
+    if isinstance(s, str):
         return filter(lambda x: x in string.printable, s).strip()
     elif isinstance(s, int):
         return "%X" % s
@@ -57,4 +57,4 @@ def smspdu_charstring_to_hex(string):
     to = "1234567"
     if len(sys.argv) > 1:
         to = sys.argv[1]
-    print encode_num(to)
+    print(encode_num(to))

sms_utilities/sms_utilities/SMS_Parse.py

@@ -12,8 +12,8 @@
 
 from smspdu import SMS_SUBMIT
 
-from rpdu import RPDU
-from SMS_Helper import clean, smspdu_charstring_to_hex
+from .rpdu import RPDU
+from .SMS_Helper import clean, smspdu_charstring_to_hex
 
 
 def parse(rp_message):
@@ -40,4 +40,4 @@ def parse(rp_message):
     h = "001000038100000e05df04810011000005cbb7fb0c02"
     if len(sys.argv) > 1:
         h = sys.argv[1]
-    print parse(h)
+    print(parse(h))

sms_utilities/sms_utilities/SMS_Submit.py

@@ -13,7 +13,7 @@
 
 from smspdu import SMS_SUBMIT
 
-import SMS_Helper
+from . import SMS_Helper
 
 
 def gen_tpdu(ref, to, text, empty):
@@ -54,4 +54,4 @@ def gen_msg(to, text, empty=False):
     if len(sys.argv) > 2:
         to = sys.argv[1]
         msg = sys.argv[2]
-    print gen_msg(to, msg)
+    print(gen_msg(to, msg))

sms_utilities/sms_utilities/__init__.py

@@ -9,4 +9,4 @@
 
 """Core modules."""
 
-import rpdu, SMS_Deliver, SMS_Helper, SMS_Parse, SMS_Submit
+from . import rpdu, SMS_Deliver, SMS_Helper, SMS_Parse, SMS_Submit