Added pass realname argument when performing User.get_info

jc · jc · commit 69cdeb799b7a · 2010-11-14T12:42:50.000-05:00
Added UK to country codes for geo.py Changed fetch interval to use milliseconds (cherry picked from commit b6e4b0b)
diff --git a/lastfm/api.py b/lastfm/api.py
@@ -20,8 +20,8 @@ class Api(object):
     API_ROOT_URL = "http://ws.audioscrobbler.com/2.0/"
     """URL of the webservice API root"""
     
-    FETCH_INTERVAL = 1
-    """The minimum interval between successive HTTP request, in seconds"""
+    FETCH_INTERVAL = 200
+    """The minimum interval between successive HTTP request, in milliseconds"""
     
     SEARCH_XMLNS = "http://a9.com/-/spec/opensearch/1.1/"
     
@@ -672,9 +672,9 @@ def _read_url_data(self, opener, url, data = None):
         with _lock:
             now = datetime.now()
             delta = now - self._last_fetch_time
-            delta = delta.seconds + float(delta.microseconds)/1000000
+            delta = delta.seconds*1000 + float(delta.microseconds)/1000
             if delta < Api.FETCH_INTERVAL:
-                time.sleep(Api.FETCH_INTERVAL - delta)
+                time.sleep((Api.FETCH_INTERVAL - delta)/1000)
             url_data = opener.open(url, data).read()
             self._last_fetch_time = datetime.now()
         return url_data
diff --git a/lastfm/geo.py b/lastfm/geo.py
@@ -497,6 +497,7 @@ class Country(LastfmBase):
          'TZ': 'Tanzania, United Republic of',
          'UA': 'Ukraine',
          'UG': 'Uganda',
+         'UK': 'United Kingdom',
          'UM': 'United States Minor Outlying Islands',
          'US': 'United States',
          'UY': 'Uruguay',
diff --git a/lastfm/user.py b/lastfm/user.py
@@ -485,6 +485,7 @@ def get_info(api, name):
         user = User(
                 api,
                 name = data.findtext('name'),
+                real_name = data.findtext('realname'),
                 image = dict([(i.get('size'), i.text) for i in data.findall('image')]),
                 url = data.findtext('url'),
             )

Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,7 @@ def get_info(api, name):`
`485`	`485`	`user = User(`
`486`	`486`	`api,`
`487`	`487`	`name = data.findtext('name'),`
	`488`	`+ real_name = data.findtext('realname'),`
`488`	`489`	`image = dict([(i.get('size'), i.text) for i in data.findall('image')]),`
`489`	`490`	`url = data.findtext('url'),`
`490`	`491`	`)`