Port oauth.py to Python 3.0 and update the twitter apps

csev · csev · commit 99b4ac57db42 · 2016-01-17T20:21:34.000-05:00
There are a few more things to do - mostly encode and decode bits
but the hard bits are done.
diff --git a/code3/hidden.py b/code3/hidden.py
@@ -1,5 +1,8 @@
 # Keep this file separate
 
+# https://apps.twitter.com/
+# Create new App
+
 def oauth() :
     return { "consumer_key" : "h7Lu...Ng",
         "consumer_secret" : "dNKenAC3New...mmn7Q",
diff --git a/code3/oauth.py b/code3/oauth.py
@@ -27,7 +27,6 @@
 import time
 import random
 import urllib.parse
-import hmac
 import binascii
 
 
@@ -566,16 +565,17 @@ def build_signature(self, oauth_request, consumer, token):
         key, raw = self.build_signature_base_string(oauth_request, consumer,
             token)
 
-        # HMAC object.
-        try:
-            import hashlib # 2.5
-            hashed = hmac.new(key, raw, hashlib.sha1)
-        except:
-            import sha # Deprecated
-            hashed = hmac.new(key, raw, sha)
+        # Compute the oauth hmac Python 3.0 style
+        # http://stackoverflow.com/questions/1306550/calculating-a-sha-hash-with-a-string-secret-key-in-python
+        import hashlib 
+        import base64
+        import hmac
+        hashed = hmac.new(bytearray(key, 'latin1'), bytearray(raw, 'latin1'), hashlib.sha1)
 
         # Calculate the digest base 64.
-        return binascii.b2a_base64(hashed.digest())[:-1]
+        digest = hashed.digest()
+        enc = base64.b64encode(digest).decode()      # py3k-mode
+        return enc
 
 
 class OAuthSignatureMethod_PLAINTEXT(OAuthSignatureMethod):
diff --git a/code3/twfriends.py b/code3/twfriends.py
@@ -41,7 +41,8 @@
     print('Retrieving account', acct)
     connection = urllib.request.urlopen(url)
     data = connection.read()
-    headers = connection.info().dict
+    headers = dict(connection.getheaders())
+
     print('Remaining', headers['x-rate-limit-remaining'])
 
     js = json.loads(data)
diff --git a/code3/twitter1.py b/code3/twitter1.py
@@ -13,6 +13,6 @@
     connection = urllib.request.urlopen(url)
     data = connection.read()
     print(data[:250])
-    headers = connection.info().dict
+    headers = dict(connection.getheaders())
     # print headers
     print('Remaining', headers['x-rate-limit-remaining'])
diff --git a/code3/twitter2.py b/code3/twitter2.py
@@ -13,7 +13,7 @@
     print('Retrieving', url)
     connection = urllib.request.urlopen(url)
     data = connection.read()
-    headers = connection.info().dict
+    headers = dict(connection.getheaders())
     print('Remaining', headers['x-rate-limit-remaining'])
     js = json.loads(data)
     print(json.dumps(js, indent=4))
diff --git a/code3/twspider.py b/code3/twspider.py
@@ -26,7 +26,8 @@
     print('Retrieving', url)
     connection = urllib.request.urlopen(url)
     data = connection.read()
-    headers = connection.info().dict
+    headers = dict(connection.getheaders())
+
     print('Remaining', headers['x-rate-limit-remaining'])
     js = json.loads(data)
     # print json.dumps(js, indent=4)
diff --git a/code3/twtest.py b/code3/twtest.py
@@ -8,5 +8,6 @@
 connection = urllib.request.urlopen(url)
 data = connection.read()
 print(data)
-headers = connection.info().dict
+
+headers = dict(connection.getheaders())
 print(headers)
diff --git a/code3/twurl.py b/code3/twurl.py
@@ -21,5 +21,5 @@ def test_me() :
     connection = urllib.request.urlopen(url)
     data = connection.read()
     print(data)
-    headers = connection.info().dict
+    headers = dict(connection.getheaders())
     print(headers)
