From: Ryan Campbell <campbellr@gmail.com>
Date: Sat, 19 Jun 2010 19:23:39 +0000 (-0600)
Subject: Don't automatically convert API key to uppercase
X-Git-Tag: v0.4-9~1
X-Git-Url: http://git.maemo.org/git/?p=mevemon;a=commitdiff_plain;h=ea5fd04b4128c7fc4ecaad0faa555f03b63b04eb

Don't automatically convert API key to uppercase

Some (older?) API keys actually do have lower case characters, and since
it is case sensitive we shouldn't automatically convert all characters
to uppercase.
---

diff --git a/package/src/ui/diablo/gui.py b/package/src/ui/diablo/gui.py
index 35bb741..e3235c9 100644
--- a/package/src/ui/diablo/gui.py
+++ b/package/src/ui/diablo/gui.py
@@ -184,8 +184,7 @@ class BaseUI():
         while not valid_credentials:
             if result == gtk.RESPONSE_OK:
                 uid = uidEntry.get_text()
-                # auth() fails if api_key has lower-case characters
-                api_key = apiEntry.get_text().upper()
+                api_key = apiEntry.get_text()
             
                 try:
                     validation.uid(uid)
diff --git a/package/src/ui/fremantle/gui.py b/package/src/ui/fremantle/gui.py
index 8544f70..7f4ccce 100644
--- a/package/src/ui/fremantle/gui.py
+++ b/package/src/ui/fremantle/gui.py
@@ -185,9 +185,7 @@ class BaseUI():
         while not valid_credentials:
             if result == gtk.RESPONSE_OK:
                 uid = uidEntry.get_text()
-                # auth() fails if api_key has lower-case characters
-                api_key = apiEntry.get_text().upper()
-            
+                api_key = apiEntry.get_text()
                 try:
                     validation.uid(uid)
                     validation.api_key(api_key)
diff --git a/package/src/validation.py b/package/src/validation.py
index 4643b16..cf37fd7 100644
--- a/package/src/validation.py
+++ b/package/src/validation.py
@@ -21,8 +21,9 @@ def api_key(api_key):
         raise ValidationError("API Key must be %s characters" % KEY_SIZE)
     elif not api_key.isalnum():
         raise ValidationError("API Key must only contain alphanumeric characters")
-    elif not api_key.isupper():
-        raise ValidationError("API Key must only contain upper-case characters")
+    # apparently the api key CAN contain lower case characters...
+    #elif not api_key.isupper():
+    #    raise ValidationError("API Key must only contain upper-case characters")
 
     return True