Merge pull request #2 from pythonkc/master

Pull changes from pythonkc fork so that we can transfer the main (pre-forked) repo to the group's account

Author: estebistec

docs/changelog.rst

@@ -4,11 +4,17 @@ Changelog
 Releases
 --------
 
-* `Release 0.0.2 - TBD`_
+* `Release 0.0.3 - August 13, 2011`_
+* `Release 0.0.2 - August 13, 2011`_
 * `Release 0.0.1 - August 7, 2011`_
 
-Release 0.0.2 - TBD
--------------------
+Release 0.0.3 - August 13, 2011
+-------------------------------
+
+* Added attendees to past events by default.
+
+Release 0.0.2 - August 13, 2011
+-------------------------------
 
 * Added ``PythonKCMeetups.get_event_attendees``
 

pythonkc_meetups/client.py

@@ -95,14 +95,18 @@ def get_past_events(self):
 
         """
 
+        def get_attendees(event):
+            return (self.get_event_attendees(event['id']) 
+                    if 'id' in event else None)
+
         query = urllib.urlencode({'key': self._api_key,
                                   'group_urlname': GROUP_URLNAME,
                                   'status': 'past',
                                   'desc': 'true'})
         url = '{0}?{1}'.format(EVENTS_URL, query)
         data = self._http_get_json(url)
         events = data['results']
-        return [parse_event(event) for event in events]
+        return [parse_event(event, get_attendees(event)) for event in events]
 
     def get_event_attendees(self, event_id):
         """

pythonkc_meetups/parsers.py

@@ -15,7 +15,7 @@
 import datetime
 
 
-def parse_event(data):
+def parse_event(data, attendees=None):
     """
     Parse a ``MeetupEvent`` from the given response data.
 
@@ -35,7 +35,8 @@ def parse_event(data):
         maybe_rsvp_count=data.get('maybe_rsvp_count', None),
         event_url=data.get('event_url', None),
         photo_url=data.get('photo_url', None),
-        venue=parse_venue(data.get('venue', None))
+        venue=parse_venue(data.get('venue', None)),
+        attendees=attendees
     )
 
 

pythonkc_meetups/types.py

@@ -30,6 +30,8 @@
     URL of the Meetup event page.
 photo_url
     URL of the event photo.
+attendees
+    List of ``MeetupMember`` that attended this event if it was in the past.
 
 MeetupVenue
 -----------
@@ -84,7 +86,8 @@
 
 MeetupEvent = namedtuple('MeetupEvent',
         ['id', 'name', 'description', 'time', 'status', 'venue',
-         'yes_rsvp_count', 'maybe_rsvp_count', 'event_url', 'photo_url'])
+         'yes_rsvp_count', 'maybe_rsvp_count', 'event_url', 'photo_url',
+         'attendees'])
 
 MeetupVenue = namedtuple('MeetupVenue',
         ['id', 'name', 'address_1', 'address_2', 'address_3', 'city', 'state',

setup.py

@@ -7,13 +7,22 @@
 
 setup(
     name='pythonkc-meetups',
-    version='0.0.2',
+    version='0.0.3',
     description='Provides PythonKC Meetup.com events.',
     license='MIT',
-    url='https://github.com/estebistec/pythonkc-meetups',
+    url='https://github.com/pythonkc/pythonkc-meetups',
     packages=find_packages(),
     install_requires=['distribute>=0.6.14', 'httplib2>=0.7.1', 
                       'mimeparse>=0.1.3', 'python-dateutil>=1.5,<2'],
     author='Steven Cummings',
-    author_email='estebistec@gmail.com'
+    author_email='estebistec@gmail.com',
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        'Topic :: Software Development :: Libraries'
+    ]
 )