[flickrpy] r57 committed - Applied patch from issue 25 (with minor edits)

[flic...@googlecode.com]

Revision: 57
Author: jim...@gmail.com
Date: Fri Nov 1 16:21:40 2013 UTC
Log: Applied patch from issue 25 (with minor edits)

http://code.google.com/p/flickrpy/source/detail?r=57

Modified:
/trunk/flickr.py

=======================================
--- /trunk/flickr.py Sat Apr 6 13:09:17 2013 UTC
+++ /trunk/flickr.py Fri Nov 1 16:21:40 2013 UTC
@@ -104,13 +104,18 @@
else:
super(Photo, self).__setattr__(key, value)

- def __getattr__(self, key):
- if not self.__loaded:
- self._load_properties()
+ def _val(self, key):
if key in self.__class__.__readonly:
return super(Photo, self).__getattribute__("_%s__%s" %
(self.__class__.__name__, key))
else:
return super(Photo, self).__getattribute__(key)
+
+ def __getattr__(self, key):
+ val = self._val(key)
+ if val == None and not self.__loaded:
+ self._load_properties()
+ val = self._val(key)
+ return val

def _load_properties(self):
"""Loads the properties from Flickr."""
@@ -1289,9 +1294,10 @@
isfamily = photo.isfamily
secret = photo.secret
server = photo.server
+ farm = photo.farm
p = Photo(photo.id, owner=owner, title=title, ispublic=ispublic,\
isfriend=isfriend, isfamily=isfamily, secret=secret, \
- server=server)
+ server=server, farm=farm)
return p

def _parse_gallery(gallery):