moved venue to a separate module and implemented venue related methods

lastfm/__init__.py

@@ -21,7 +21,8 @@ from lastfm.tag import Tag
 from lastfm.tasteometer import Tasteometer
 from lastfm.track import Track
 from lastfm.user import User
+from lastfm.venue import Venue
 
 __all__ = ['LastfmError', 'Api', 'Album', 'Artist', 'Event',
            'Location', 'Country', 'Group', 'Playlist', 'Tag',
-           'Tasteometer', 'Track', 'User', 'ObjectCache']
+           'Tasteometer', 'Track', 'User', 'Venue', 'ObjectCache']

lastfm/api.py

@@ -175,6 +175,12 @@ class Api(object):
         if self.session_key is not None:
             return User.get_authenticated_user(self)
         return None
+    
+    def get_venue(self, venue):
+        return self.search_venue(venue)[0]
+    
+    def search_venue(self, venue):
+        return Venue.search(self, search_item = venue)
 
     def _build_url(self, url, path_elements=None, extra_params=None):
         # Break url into consituent parts
@@ -397,6 +403,7 @@ from lastfm.tag import Tag
 from lastfm.tasteometer import Tasteometer
 from lastfm.track import Track
 from lastfm.user import User
+from lastfm.venue import Venue
 
 if sys.version_info >= (2, 5):
     import xml.etree.cElementTree as ElementTree

lastfm/event.py

@@ -172,7 +172,7 @@ class Event(LastfmBase, Cacheable, Sharable, Shoutable):
                                                        longitude = float(data.findtext(
                                                            'venue/location/{%s}point/{%s}long' % ((Location.XMLNS,)*2)
                                                            )),
-                                                       timezone = data.findtext('venue/location/timezone')
+                                                       #timezone = data.findtext('venue/location/timezone')
                                                        ),
                                    url = data.findtext('venue/url')
                                    ),
@@ -220,5 +220,6 @@ import time
 from lastfm.api import Api
 from lastfm.artist import Artist
 from lastfm.error import InvalidParametersError
-from lastfm.geo import Venue, Location, Country
+from lastfm.geo import Location, Country
 from lastfm.stats import Stats
+from lastfm.venue import Venue

lastfm/geo.py

@@ -94,50 +94,6 @@ class Geo(object):
                 for t in data.findall('track')
                 ]
 
-class Venue(LastfmBase, Cacheable):
-    """A class representing a venue of an event"""
-    def init(self,
-                 name = None,
-                 location = None,
-                 url = None):
-        self._name = name
-        self._location = location
-        self._url = url
-
-    @property
-    def name(self):
-        """name of the venue"""
-        return self._name
-
-    @property
-    def location(self):
-        """location of the event"""
-        return self._location
-
-    @property
-    def url(self):
-        """url of the event's page"""
-        return self._url
-
-    @staticmethod
-    def _hash_func(*args, **kwds):
-        try:
-            return hash(kwds['url'])
-        except KeyError:
-            raise InvalidParametersError("url has to be provided for hashing")
-
-    def __hash__(self):
-        return self.__class__._hash_func(url = self.url)
-
-    def __eq__(self, other):
-        return self.url == other.url
-
-    def __lt__(self, other):
-        return self.name < other.name
-
-    def __repr__(self):
-        return "<lastfm.geo.Venue: %s, %s>" % (self.name, self.location.city)
-
 class Location(LastfmBase, Cacheable):
     """A class representing a location of an event"""
     XMLNS = "http://www.w3.org/2003/01/geo/wgs84_pos#"

lastfm/venue.py

@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+
+__author__ = "Abhinav Sarkar <abhinav@abhinavsarkar.net>"
+__version__ = "0.2"
+__license__ = "GNU Lesser General Public License"
+
+from lastfm.base import LastfmBase
+from lastfm.mixins import Cacheable, Searchable
+from lastfm.lazylist import lazylist
+
+class Venue(LastfmBase, Cacheable, Searchable):
+    """A class representing a venue of an event"""
+    def init(self,
+             api,
+             id = None,
+             name = None,
+             location = None,
+             url = None):
+        if not isinstance(api, Api):
+            raise InvalidParametersError("api reference must be supplied as an argument")
+        self._api = api
+        self._id = id
+        self._name = name
+        self._location = location
+        self._url = url
+
+    @property
+    def id(self):
+        """id of the venue"""
+        return self._id
+    
+    @property
+    def name(self):
+        """name of the venue"""
+        return self._name
+
+    @property
+    def location(self):
+        """location of the event"""
+        return self._location
+
+    @property
+    def url(self):
+        """url of the event's page"""
+        return self._url
+
+    @LastfmBase.cached_property
+    def events(self):
+        params = self._default_params({'method': 'venue.getEvents'})
+        data = self._api._fetch_data(params).find('events')
+
+        return [
+                Event.create_from_data(self._api, e)
+                for e in data.findall('event')
+                ]
+
+    def get_past_events(self,
+                      limit = None):
+        params = self._default_params({'method': 'venue.getPastEvents'})
+        if limit is not None:
+            params.update({'limit': limit})
+
+        @lazylist
+        def gen(lst):
+            data = self._api._fetch_data(params).find('events')
+            total_pages = int(data.attrib['totalPages'])
+
+            @lazylist
+            def gen2(lst, data):
+                for e in data.findall('event'):
+                    yield Event.create_from_data(self._api, e)
+
+            for e in gen2(data):
+                yield e
+
+            for page in xrange(2, total_pages+1):
+                params.update({'page': page})
+                data = self._api._fetch_data(params).find('events')
+                for e in gen2(data):
+                    yield e
+        return gen()
+
+    @LastfmBase.cached_property
+    def past_events(self):
+        return self.get_past_events()
+    
+    def _default_params(self, extra_params = {}):
+        if not self.id:
+            raise InvalidParametersError("venue id has to be provided.")
+        params = {'venue': self.id}
+        params.update(extra_params)
+        return params
+    
+    @staticmethod
+    def _search_yield_func(api, venue):
+        return Venue(
+                     api,
+                     id = int(venue.findtext('id')),
+                     name = venue.findtext('name'),
+                     location = Location(
+                                         api,
+                                         city = venue.findtext('location/city'),
+                                         country = Country(
+                                            api,
+                                            name = venue.findtext('location/country')
+                                            ),
+                                         street = venue.findtext('location/street'),
+                                         postal_code = venue.findtext('location/postalcode'),
+                                         latitude = float(venue.findtext(
+                                             'location/{%s}point/{%s}lat' % ((Location.XMLNS,)*2)
+                                             )),
+                                         longitude = float(venue.findtext(
+                                             'location/{%s}point/{%s}long' % ((Location.XMLNS,)*2)
+                                             )),
+                                         ),
+                     url = venue.findtext('url')
+                     )
+    
+    @staticmethod
+    def _hash_func(*args, **kwds):
+        try:
+            return hash(kwds['url'])
+        except KeyError:
+            raise InvalidParametersError("url has to be provided for hashing")
+
+    def __hash__(self):
+        return self.__class__._hash_func(url = self.url)
+
+    def __eq__(self, other):
+        return self.url == other.url
+
+    def __lt__(self, other):
+        return self.name < other.name
+
+    def __repr__(self):
+        return "<lastfm.geo.Venue: %s, %s>" % (self.name, self.location.city)
+    
+from lastfm.api import Api
+from lastfm.event import Event
+from lastfm.geo import Location, Country
+from lastfm.error import InvalidParametersError