Allow original_url to behave as an attribute like method already does. Remove the original_url from the test to avoid confusion.

Note: working with __getattr__ and __setattr__ this way is problematic. Those attributes exist on the Url class, not AttrDict. So while this is an improvement, it's perpetuating bad behavior.

Author: joncotton

embedly/models.py

@@ -27,15 +27,15 @@ def __init__(self, data=None):
         self.data = data
 
     def __getattr__(self, name):
-        if name in ['data', 'method']:
+        if name in ['data', 'method', 'original_url']:
             return object.__getattr__(self, name)
         try:
             return self.data[name]
-        except KeyError as e:
+        except KeyError:
             return None
 
     def __setattr__(self, name, value):
-        if name in ['data', 'method']:
+        if name in ['data', 'method', 'original_url']:
             object.__setattr__(self, name, value)
         else:
             self.data[name] = value

embedly/tests.py

@@ -22,7 +22,6 @@ def test_model(self):
             'provider_url': 'http://www.google.com/',
             'safe': True,
             'description': 'Google',
-            'original_url': 'http://google.com/',
             'url': 'http://www.google.com/',
             'type': 'html',
             'object': {},
@@ -43,10 +42,10 @@ def test_model(self):
 
         obj = Url(data, 'preview', 'http://google.com/')
 
-        self.assertTrue(len(obj) is 17)
-        self.assertTrue(len(obj.values()) is 17)
-        self.assertTrue(len(obj.keys()) is 17)
-        self.assertTrue(len(obj.items()) is 17)
+        self.assertTrue(len(obj) is 16)
+        self.assertTrue(len(obj.values()) is 16)
+        self.assertTrue(len(obj.keys()) is 16)
+        self.assertTrue(len(obj.items()) is 16)
 
         self.assertTrue('type' in obj.keys())
         self.assertTrue('html' in obj.values())