Converted simplenote.py to python 3 and tested

simplenote.py

@@ -6,12 +6,12 @@
     Python library for accessing the Simplenote API
 
     :copyright: (c) 2011 by Daniel Schauenberg
+    :ported to python 3 by sickmartian
     :license: MIT, see LICENSE for more details.
 """
 
-import urllib
-import urllib2
-from urllib2 import HTTPError
+import urllib.request, urllib.parse, urllib.error
+from urllib.error import HTTPError
 import base64
 import time
 import datetime
@@ -39,8 +39,8 @@ class Simplenote(object):
 
     def __init__(self, username, password):
         """ object constructor """
-        self.username = urllib2.quote(username)
-        self.password = urllib2.quote(password)
+        self.username = username
+        self.password = password
         self.token = None
 
     def authenticate(self, user, password):
@@ -54,12 +54,12 @@ def authenticate(self, user, password):
             Simplenote API token as string
 
         """
-        auth_params = "email=%s&password=%s" % (user, password)
-        values = base64.encodestring(auth_params)
-        request = Request(AUTH_URL, values)
+        auth_params = "email={0}&password={1}".format(user, password)
+        values = base64.b64encode(bytes(auth_params,'utf-8'))
+        request = urllib.request.Request(AUTH_URL, values)
         try:
-            res = urllib2.urlopen(request).read()
-            token = urllib2.quote(res)
+            res = urllib.request.urlopen(request).read()
+            token = res
         except HTTPError:
             raise SimplenoteLoginFailed('Login to Simplenote API failed!')
         except IOError: # no connection exception
@@ -78,7 +78,7 @@ def get_token(self):
         """
         if self.token == None:
             self.token = self.authenticate(self.username, self.password)
-        return self.token
+        return str(self.token,'utf-8')
 
 
     def get_note(self, noteid, version=None):
@@ -100,20 +100,20 @@ def get_note(self, noteid, version=None):
         if version is not None:
             params_version = '/' + str(version)
 
-        params = '/%s%s?auth=%s&email=%s' % (str(noteid), params_version, self.get_token(), self.username)
-        request = Request(DATA_URL+params)
+        params = '/{0}{1}?auth={2}&email={3}'.format(noteid, params_version, self.get_token(), self.username)
+        request = urllib.request.Request(DATA_URL+params)
         try:
-            response = urllib2.urlopen(request)
-        except HTTPError, e:
+            response = urllib.request.urlopen(request)
+        except HTTPError as e:
             return e, -1
-        except IOError, e:
+        except IOError as e:
             return e, -1
-        note = json.loads(response.read())
+        note = json.loads(response.read().decode('utf-8'))
         # use UTF-8 encoding
-        note["content"] = note["content"].encode('utf-8')
+        note["content"] = note["content"]
         # For early versions of notes, tags not always available
-        if note.has_key("tags"):
-            note["tags"] = [t.encode('utf-8') for t in note["tags"]]
+        if "tags" in note:
+            note["tags"] = [t for t in note["tags"]]
         return note, 0
 
     def update_note(self, note):
@@ -130,33 +130,28 @@ def update_note(self, note):
             - status (int): 0 on sucesss and -1 otherwise
 
         """
-        # use UTF-8 encoding
-        note["content"] = unicode(note["content"], 'utf-8')
-        if "tags" in note:
-            note["tags"] = [unicode(t, 'utf-8') for t in note["tags"]]
-
         # determine whether to create a new note or updated an existing one
         if "key" in note:
             # set modification timestamp if not set by client
             if 'modifydate' not in note:
                 note["modifydate"] = time.time()
 
-            url = '%s/%s?auth=%s&email=%s' % (DATA_URL, note["key"],
-                                              self.get_token(), self.username)
+            url = '{0}/{1}?auth={2}&email={3}'.format(DATA_URL, note["key"],
+                                                      self.get_token(), self.username)
         else:
-            url = '%s?auth=%s&email=%s' % (DATA_URL, self.get_token(), self.username)
-        request = Request(url, urllib.quote(json.dumps(note)))
+            url = '{0}?auth={1}&email={2}'.format(DATA_URL, self.get_token(), self.username)
+        request = urllib.request.Request(url, json.dumps(note).encode('utf-8'))
         response = ""
         try:
-            response = urllib2.urlopen(request)
-        except IOError, e:
+            response = urllib.request.urlopen(request)
+        except IOError as e:
             return e, -1
-        note = json.loads(response.read())
-        if note.has_key("content"):
+        note = json.loads(response.read().decode('utf-8'))
+        if "content" in note:
             # use UTF-8 encoding
-            note["content"] = note["content"].encode('utf-8')
-        if note.has_key("tags"):
-            note["tags"] = [t.encode('utf-8') for t in note["tags"]]
+            note["content"] = note["content"]
+        if "tags" in note:
+            note["tags"] = [t for t in note["tags"]]
         return note, 0
 
     def add_note(self, note):
@@ -213,8 +208,8 @@ def get_note_list(self, since=None, tags=[]):
         notes = { "data" : [] }
 
         # get the note index
-        params = 'auth=%s&email=%s&length=%s' % (self.get_token(), self.username,
-                                                 NOTE_FETCH_LENGTH)
+        params = 'auth={0}&email={1}&length={2}'.format(self.get_token(), self.username,
+                                                        NOTE_FETCH_LENGTH)
         if since is not None:
             try:
                 sinceUT = time.mktime(datetime.datetime.strptime(since, "%Y-%m-%d").timetuple())
@@ -224,8 +219,8 @@ def get_note_list(self, since=None, tags=[]):
 
         # perform initial HTTP request
         try:
-            request = Request(INDX_URL+params)
-            response = json.loads(urllib2.urlopen(request).read())
+            request = urllib.request.Request(INDX_URL+params)
+            response = json.loads(urllib.request.urlopen(request).read().decode('utf-8'))
             notes["data"].extend(response["data"])
         except IOError:
             status = -1
@@ -243,8 +238,8 @@ def get_note_list(self, since=None, tags=[]):
 
             # perform the actual HTTP request
             try:
-                request = Request(INDX_URL+params)
-                response = json.loads(urllib2.urlopen(request).read())
+                request = urllib.request.Request(INDX_URL+params)
+                response = json.loads(urllib.request.urlopen(request).read())
                 notes["data"].extend(response["data"])
             except IOError:
                 status = -1
@@ -299,30 +294,11 @@ def delete_note(self, note_id):
         if (status == -1):
             return note, status
 
-        params = '/%s?auth=%s&email=%s' % (str(note_id), self.get_token(),
-                                           self.username)
-        request = Request(url=DATA_URL+params, method='DELETE')
+        params = '/{0}?auth={1}&email={2}'.format(str(note_id), self.get_token(),
+                                                  self.username)
+        request = urllib.request.Request(url=DATA_URL+params, method='DELETE')
         try:
-            urllib2.urlopen(request)
-        except IOError, e:
+            urllib.request.urlopen(request)
+        except IOError as e:
             return e, -1
         return {}, 0
-
-
-class Request(urllib2.Request):
-    """ monkey patched version of urllib2's Request to support HTTP DELETE
-        Taken from http://python-requests.org, thanks @kennethreitz
-    """
-
-    def __init__(self, url, data=None, headers={}, origin_req_host=None,
-                unverifiable=False, method=None):
-        urllib2.Request.__init__(self, url, data, headers, origin_req_host, unverifiable)
-        self.method = method
-
-    def get_method(self):
-        if self.method:
-            return self.method
-
-        return urllib2.Request.get_method(self)
-
-

test_simplenote.py

@@ -0,0 +1,22 @@
+exec(open("./simplenote.py").read())
+simplenote_instance = Simplenote('test_user2@mailinator.com','testPassword')
+new_note = simplenote_instance.add_note('new test note')[0]
+print('New note:')
+print(new_note)
+note_list = simplenote_instance.get_note_list()[0]
+print('We have:')
+print(note_list)
+simplenote_instance.trash_note(new_note['key'])
+note_list = simplenote_instance.get_note_list()[0]
+print('Trashed note:')
+print(note_list)
+
+for note in note_list:
+    simplenote_instance.delete_note(note['key'])
+note_list = simplenote_instance.get_note_list()[0]
+print('Deleted note:')
+print(note_list)
+
+# note = simplenote_instance.get_note('agtzaW1wbGUtbm90ZXIRCxIETm90ZRiAgIDvovS2CQw')[0]
+# note['content'] = 'new content'
+# result = simplenote_instance.update_note(note)