From 2dbe854fcbd68e20937e2c26c4d56e3273c4c2bc Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Fri, 28 Oct 2011 10:40:04 -0700
Subject: [PATCH 01/52] wip 2.0 rewrite: handle paginated responses

---
 discogs_client.py | 494 +++++++++++++++++++++++-----------------------
 setup.py          |   1 +
 2 files changed, 248 insertions(+), 247 deletions(-)

diff --git a/discogs_client.py b/discogs_client.py
index eaf44b0..0d3cf55 100644
--- a/discogs_client.py
+++ b/discogs_client.py
@@ -1,5 +1,5 @@
-__version_info__ = (1,1,1)
-__version__ = '1.1.1'
+__version_info__ = (2,0,0)
+__version__ = '2.0.0'
 
 import requests
 import json
@@ -7,336 +7,336 @@
 import httplib
 from collections import defaultdict
 
-api_uri = 'http://api.discogs.com'
-user_agent = None
+BASE_URL = 'http://api.discogs.com'
 
 class DiscogsAPIError(Exception):
     """Root Exception class for Discogs API errors."""
     pass
 
 
-class UserAgentError(DiscogsAPIError):
-    """Exception class for User-Agent problems."""
+class ConfigurationError(DiscogsAPIError):
+    """Exception class for problems with the configuration of this client."""
     def __init__(self, msg):
         self.msg = msg
 
     def __str__(self):
-        return repr(self.msg)
+        return self.msg
 
 
 class HTTPError(DiscogsAPIError):
-    """Exception class for HTTP(lib) errors."""
-    def __init__(self, code):
-        self.code = code
-        self.msg = httplib.responses[self.code]
+    """Exception class for HTTP errors."""
+    def __init__(self, message, code):
+        self.msg = '{} {}: {}'.format(code, httplib.responses[code], message)
 
     def __str__(self):
-        return "HTTP status %i: %s." % (self.code, self.msg)
+        return self.msg
 
 
-class PaginationError(DiscogsAPIError):
-    """Exception class for issues with paginated requests."""
-    def __init__(self, msg):
-        self.msg = msg
+class Client(object):
+    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_key=None):
+        self.user_agent = user_agent
+        self.consumer_key = consumer_key
+        self.consumer_secret = consumer_secret
+        self.access_key = access_key
+        self.verbose = False
 
-    def __str__(self):
-        return repr(self.msg)
+    def _check_user_agent(self):
+        if self.user_agent:
+            self._headers['user-agent'] = user_agent
+        else:
+            raise ConfigurationError("Invalid or no User-Agent set.")
 
+    def _request(self, method, url, data=None):
+        if self.verbose:
+            print ' '.join((method, url))
 
-class APIBase(object):
-    def __init__(self):
-        self._cached_response = None
-        self._params = {}
-        self._headers = { 'accept-encoding': 'gzip, deflate' }
+        response = requests.request(method, url, data=data)
 
-    def __str__(self):
-        return '<%s "%s">' % (self.__class__.__name__, self._id)
+        if response.status_code == 204:
+            return None
 
-    def __repr__(self):
-        return self.__str__().encode('utf-8')
+        body = json.loads(response.content)
 
-    def _check_user_agent(self):
-        if 'user_agent' in globals() and user_agent is not None:
-            self._headers['user-agent'] = user_agent
-        return 'user-agent' in self._headers and self._headers.get('user-agent')
+        if 200 <= response.status_code < 300:
+            return body
+        else:
+            raise HTTPError(body['message'], response.status_code)
 
-    def _clear_cache(self):
-        self._cached_response = None
+    def _get(self, url):
+        return self._request('GET', url)
 
-    @property
-    def _response(self):
-        if not self._cached_response:
-            if not self._check_user_agent():
-                raise UserAgentError("Invalid or no User-Agent set.")
-            self._cached_response = requests.get(self._uri, params=self._params, headers=self._headers)
+    def _delete(self, url):
+        return self._request('DELETE', url)
+
+    def _post(self, url, data):
+        return self._request('POST', url, data)
+
+    def _patch(self, url, data):
+        return self._request('PATCH', url, data)
+
+    def _put(self, url, data):
+        return self._request('PUT', url, data)
+
+    def search(self, query):
+        return [
+            Artist(self, 1)
+        ]
+
+    def artist(self, id):
+        return Artist(self, id)
+
+    def release(self, id):
+        return Release(self, id)
 
-        return self._cached_response
+    def master(self, id):
+        return Master(self, id)
+
+    def label(self, id):
+        return Label(self, id)
+
+
+class BaseAPIObject(object):
+    def __init__(self, client, id):
+        self.data = {'id': id}
+        self.client = client
+        self._known_invalid_keys = []
+
+    @classmethod
+    def _from_dict(cls, client, dict_):
+        obj = cls(client, dict_['id'])
+        obj.data.update(dict_)
+        return obj
+
+    def refresh(self):
+        if self.data.get('resource_url'):
+            data = self.client._get(self.data['resource_url'])
+            self.data.update(data)
+
+    def fetch(self, key, default=None):
+        if key in self._known_invalid_keys:
+            return default
+
+        try:
+            return self.data[key]
+        except KeyError:
+            # Fetch the object if we don't know about this key.
+            # It might exist but not be in our cache.
+            self.refresh()
+            try:
+                return self.data[key]
+            except:
+                self._known_invalid_keys.append(key)
+                return default
+
+
+class PaginatedList(object):
+    def __init__(self, client, url):
+        self.client = client
+        self.url = url
+        self._num_pages = None
+        self._num_items = None
+        self._pages = {}
+        self._per_page = 50
+        self._list_key = 'items'
 
     @property
-    def _uri_name(self):
-        return self.__class__.__name__.lower()
+    def per_page(self):
+        return self._per_page
+
+    @per_page.setter
+    def per_page(self, value):
+        self._per_page = value
+        self._invalidate()
+
+    def _invalidate(self):
+        self._pages = {}
+        self._num_pages = None
+        self._num_items = None
+
+    def _load_pagination_info(self):
+        data = self.client._get('%s?page=%d&per_page=%d' % (self.url, 1, self._per_page))
+        self._num_pages = data['pagination']['pages']
+        self._num_items = data['pagination']['items']
 
     @property
-    def _uri(self):
-        return '%s/%s/%s' % (api_uri, self._uri_name, urllib.quote(unicode(self._id).encode('utf-8')))
+    def pages(self):
+        if self._num_pages is None:
+            self._load_pagination_info()
+        return self._num_pages
 
     @property
-    def data(self):
-        if self._response.content and self._response.status_code == 200:
-            release_json = json.loads(self._response.content)
-            return release_json.get('resp').get(self._uri_name)
-        else:
-            status_code = self._response.status_code
-            raise HTTPError(status_code)
-
-def _parse_credits(extraartists):
-    """
-    Parse release and track level credits
-    """
-    _credits = defaultdict(list)
-    for artist in extraartists:
-        role = artist.get('role')
-        tracks = artist.get('tracks')
-
-        artist_dict = {'artists': Artist(artist['name'], anv=artist.get('anv'))}
-
-        if tracks:
-            artist_dict['tracks'] = tracks
-
-        _credits[role].append(artist_dict)
-    return _credits
-
-def _class_from_string(api_string):
-    class_map = {
-            'master': MasterRelease,
-            'release': Release,
-            'artist': Artist,
-            'label': Label
-    }
-
-    return class_map[api_string]
-
-class Artist(APIBase):
-    def __init__(self, name, anv=None):
-        self._id = name
-        self._aliases = []
-        self._namevariations = []
-        self._releases = []
-        self._anv = anv or None
-        APIBase.__init__(self)
+    def count(self):
+        if self._num_items is None:
+            self._load_pagination_info()
+        return self._num_items
 
-    def __str__(self):
-        return '<%s "%s">' % (self.__class__.__name__, self._anv + '*' if self._anv else self._id)
+    def page(self, index):
+        if not index in self._pages:
+            data = self.client._get('%s?page=%d&per_page=%d' % (self.url, index, self._per_page))
+            self._pages[index] = [self._transform(item) for item in data[self._list_key]]
+        return self._pages[index]
+
+    def _transform(self, item):
+        return item
+
+    def __getitem__(self, index):
+        page_index = index / self.per_page + 1
+        offset = index % self.per_page
+        page = self.page(page_index)
+        return page[offset]
+
+    def __len__(self):
+        return self.count
+
+    def __iter__(self):
+        for i in xrange(1, self.pages + 1):
+            page = self.page(i)
+            for item in page:
+                yield item
+
+
+class Artist(BaseAPIObject):
+    def __init__(self, client, id):
+        super(Artist, self).__init__(client, id)
+        self.data['resource_url'] = BASE_URL + '/artists/%d' % id
 
     @property
-    def name(self):
-        return self._id
+    def id(self):
+        return self.fetch('id')
 
     @property
-    def anv(self):
-        return self._anv
+    def name(self):
+        return self.fetch('name')
 
     @property
-    def aliases(self):
-        if not self._aliases:
-            for alias in self.data.get('aliases', []):
-                self._aliases.append(Artist(alias))
-        return self._aliases
+    def real_name(self):
+        return self.fetch('realname')
 
     @property
-    def releases(self):
-        # TODO: Implement fetch many release IDs
-        #return [Release(r.get('id') for r in self.data.get('releases')]
-        if not self._releases:
-            self._params.update({'releases': '1'})
-            self._clear_cache()
-
-            for r in self.data.get('releases', []):
-                self._releases.append(_class_from_string(r['type'])(r['id']))
-        return self._releases
-
-class Release(APIBase):
-    def __init__(self, id):
-        self._id = id
-        self._artists = []
-        self._master = None
-        self._labels = []
-        self._credits = None
-        self._tracklist = []
-        APIBase.__init__(self)
+    def profile(self):
+        return self.fetch('profile')
 
     @property
-    def artists(self):
-        if not self._artists:
-            self._artists = [Artist(a['name']) for a in self.data.get('artists', [])]
-        return self._artists
+    def data_quality(self):
+        return self.fetch('data_quality')
 
     @property
-    def master(self):
-        if not self._master and self.data.get('master_id'):
-            self._master = MasterRelease(self.data.get('master_id'))
-        return self._master
+    def name_variations(self):
+        return self.fetch('namevariations')
 
     @property
-    def labels(self):
-        if not self._labels:
-            self._labels =  [Label(l['name']) for l in self.data.get('labels', [])]
-        return self._labels
+    def aliases(self):
+        return [Artist._from_dict(self.client, d) for d in self.fetch('aliases', [])]
 
     @property
-    def credits(self):
-        if not self._credits:
-            self._credits = _parse_credits(self.data.get('extraartists', []))
-        return self._credits
+    def urls(self):
+        return self.fetch('urls')
 
     @property
-    def tracklist(self):
-        if not self._tracklist:
-            for track in self.data.get('tracklist', []):
-                artists = []
-                track['extraartists'] = _parse_credits(track.get('extraartists', []))
+    def releases(self):
+        return ReleaseList(self.client, self.fetch('releases_url'))
 
-                for artist in track.get('artists', []):
-                    artists.append(Artist(artist['name'], anv=artist.get('anv')))
+    def __repr__(self):
+        return '<Artist %r %r>' % (self.id, self.name)
 
-                    if artist['join']:
-                        artists.append(artist['join'])
-                track['artists'] = artists
-                track['type'] = 'Track' if track['position'] else 'Index Track'
 
-                self._tracklist.append(track)
-        return self._tracklist
+class Release(BaseAPIObject):
+    def __init__(self, client, id):
+        super(Release, self).__init__(client, id)
+        self.data['resource_url'] = BASE_URL + '/releases/%d' % id
+
+    @property
+    def id(self):
+        return self.fetch('id')
 
     @property
     def title(self):
-        return self.data.get('title')
+        return self.fetch('title')
 
-class MasterRelease(APIBase):
-    def __init__(self, id):
-        self._id = id
-        self._key_release = None
-        self._versions = []
-        self._artists = []
-        APIBase.__init__(self)
+    @property
+    def year(self):
+        return self.fetch('year')
 
-    # Override class name introspection in BaseAPI since it would otherwise return "masterrelease"
     @property
-    def _uri_name(self):
-        return 'master'
+    def thumb(self):
+        return self.fetch('thumb')
 
     @property
-    def key_release(self):
-        if not self._key_release:
-            self._key_release = Release(self.data.get('main_release'))
-        return self._key_release
+    def data_quality(self):
+        return self.fetch('data_quality')
 
     @property
-    def title(self):
-        return self.key_release.data.get('title')
+    def status(self):
+        return self.fetch('status')
 
     @property
-    def versions(self):
-        if not self._versions:
-            for version in self.data.get('versions', []):
-                self._versions.append(Release(version.get('id')))
-        return self._versions
+    def videos(self):
+        return self.fetch('videos')
 
     @property
     def artists(self):
-        if not self._artists:
-            for artist in self.data.get('artists', []):
-                self._artists.append(Artist(artist.get('name')))
-        return self._artists
+        return [Artist._from_dict(self.client, d) for d in self.fetch('artists', [])]
 
     @property
-    def tracklist(self):
-        return self.key_release.tracklist
-
-class Label(APIBase):
-    def __init__(self, name):
-        self._id = name
-        self._sublabels = []
-        self._parent_label = None
-        APIBase.__init__(self)
+    def credits(self):
+        return [Artist._from_dict(self.client, d) for d in self.fetch('extraartists', [])]
 
     @property
-    def sublabels(self):
-        if not self._sublabels:
-            for sublabel in self.data.get('sublabels', []):
-                self._sublabels.append(Label(sublabel))
-        return self._sublabels
+    def labels(self):
+        return [Label._from_dict(self.client, d) for d in self.fetch('labels', [])]
+
+    def __repr__(self):
+        return '<Release %r %r>' % (self.id, self.title)
 
-    @property
-    def parent_label(self):
-        if not self._parent_label and self.data.get('parentLabel'):
-            self._parent_label = Label(self.data.get('parentLabel'))
-        return self._parent_label
+
+class Master(BaseAPIObject):
+    def __init__(self, client, id):
+        super(Master, self).__init__(client, id)
+        self.data['resource_url'] = BASE_URL + '/masters/%d' % id
 
     @property
-    def releases(self):
-        self._params.update({'releases': '1'})
-        self._clear_cache()
-        return self.data.get('releases')
-
-class Search(APIBase):
-    def __init__(self, query, page=1):
-        self._id = query
-        self._results = {}
-        self._exactresults = []
-        self._page = page
-        APIBase.__init__(self)
-        self._params['q'] = self._id
-        self._params['page'] = self._page
-
-    def _to_object(self, result):
-        id = result['title']
-        if result['type'] in ('master', 'release'):
-            id = result['uri'].split('/')[-1]
-        elif result['type'] == 'artist':
-            return Artist(id, anv=result.get('anv'))
-        return _class_from_string(result['type'])(id)
+    def id(self):
+        return self.fetch('id')
 
     @property
-    def _uri(self):
-        return '%s/%s' % (api_uri, self._uri_name)
+    def title(self):
+        return self.fetch('title')
 
     @property
-    def exactresults(self):
-        if not self.data:
-            return []
+    def data_quality(self):
+        return self.fetch('data_quality')
 
-        if not self._exactresults:
-            for result in self.data.get('exactresults', []):
-                self._exactresults.append(self._to_object(result))
-        return self._exactresults
+    def __repr__(self):
+        return '<Master %r %r>' % (self.id, self.title)
 
-    def results(self, page=1):
-        page_key = 'page%s' % page
 
-        if page != self._page:
-            if page > self.pages:
-                raise PaginationError('Page number exceeds maximum number of pages returned.')
-            self._params['page'] = page
-            self._clear_cache()
+class Label(BaseAPIObject):
+    def __init__(self, client, id):
+        super(Label, self).__init__(client, id)
+        self.data['resource_url'] = BASE_URL + '/labels/%d' % id
 
-        if not self.data:
-            return []
+    @property
+    def id(self):
+        return self.fetch('id')
 
-        if page_key not in self._results:
-            self._results[page_key] = []
-            for result in self.data['searchresults']['results']:
-                self._results[page_key].append(self._to_object(result))
+    @property
+    def name(self):
+        return self.fetch('name')
 
-        return self._results[page_key]
 
-    @property
-    def numresults(self):
-        if not self.data:
-            return 0
-        return int(self.data['searchresults'].get('numResults', 0))
+class ReleaseList(PaginatedList):
+    def __init__(self, client, url):
+        super(ReleaseList, self).__init__(client, url)
+        self._list_key = 'releases'
 
-    @property
-    def pages(self):
-        if not self.data:
-            return 0
-        return (self.numresults / 20) + 1
+    def _transform(self, item):
+        type = item.get('type', 'release')
+        return CLASS_MAP[type]._from_dict(self.client, item)
+
+
+CLASS_MAP = {
+    'artist': Artist,
+    'release': Release,
+    'master': Master,
+    'label': Label,
+}
diff --git a/setup.py b/setup.py
index 2c9c0d0..1729b38 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@
             ],
         install_requires=[
             'requests',
+            'oauth2',
             ],
         py_modules=[
             'discogs_client',

From 5688364be377b5b9ca41c02885f3469a6f997b04 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Fri, 28 Oct 2011 17:05:05 -0700
Subject: [PATCH 02/52] Better pagination handling, searching, users.

---
 discogs_client.py | 193 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 149 insertions(+), 44 deletions(-)

diff --git a/discogs_client.py b/discogs_client.py
index 0d3cf55..9d0e7c5 100644
--- a/discogs_client.py
+++ b/discogs_client.py
@@ -5,10 +5,25 @@
 import json
 import urllib
 import httplib
+import urlparse
+from datetime import datetime
 from collections import defaultdict
 
 BASE_URL = 'http://api.discogs.com'
 
+
+def _parse_timestamp(timestamp):
+    """Convert an ISO 8601 timestamp into a datetime."""
+    return datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S')
+
+
+def _update_qs(url, params):
+    """A not-very-intelligent function to glom parameters onto a query string."""
+    joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
+    separator = '&' if '?' in url else '?'
+    return url + separator + joined_qs
+
+
 class DiscogsAPIError(Exception):
     """Root Exception class for Discogs API errors."""
     pass
@@ -26,6 +41,7 @@ def __str__(self):
 class HTTPError(DiscogsAPIError):
     """Exception class for HTTP errors."""
     def __init__(self, message, code):
+        self.status_code = code
         self.msg = '{} {}: {}'.format(code, httplib.responses[code], message)
 
     def __str__(self):
@@ -35,9 +51,6 @@ def __str__(self):
 class Client(object):
     def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_key=None):
         self.user_agent = user_agent
-        self.consumer_key = consumer_key
-        self.consumer_secret = consumer_secret
-        self.access_key = access_key
         self.verbose = False
 
     def _check_user_agent(self):
@@ -78,35 +91,36 @@ def _put(self, url, data):
         return self._request('PUT', url, data)
 
     def search(self, query):
-        return [
-            Artist(self, 1)
-        ]
+        # TODO: Other filtering parameters
+        # TODO: Alias q to ql on the server side
+        return MixedObjectList(
+            self,
+            _update_qs(BASE_URL + '/database/search', {'ql': query}),
+            'results'
+        )
 
     def artist(self, id):
-        return Artist(self, id)
+        return Artist(self, {'id': id})
 
     def release(self, id):
-        return Release(self, id)
+        return Release(self, {'id': id})
 
     def master(self, id):
-        return Master(self, id)
+        return Master(self, {'id': id})
 
     def label(self, id):
-        return Label(self, id)
+        return Label(self, {'id': id})
+
+    def user(self, username):
+        return User(self, {'username': username})
 
 
 class BaseAPIObject(object):
-    def __init__(self, client, id):
-        self.data = {'id': id}
+    def __init__(self, client, dict_):
+        self.data = dict_
         self.client = client
         self._known_invalid_keys = []
 
-    @classmethod
-    def _from_dict(cls, client, dict_):
-        obj = cls(client, dict_['id'])
-        obj.data.update(dict_)
-        return obj
-
     def refresh(self):
         if self.data.get('resource_url'):
             data = self.client._get(self.data['resource_url'])
@@ -154,7 +168,7 @@ def _invalidate(self):
         self._num_items = None
 
     def _load_pagination_info(self):
-        data = self.client._get('%s?page=%d&per_page=%d' % (self.url, 1, self._per_page))
+        data = self.client._get(_update_qs(self.url, {'page': 1, 'per_page': self._per_page}))
         self._num_pages = data['pagination']['pages']
         self._num_items = data['pagination']['items']
 
@@ -172,7 +186,7 @@ def count(self):
 
     def page(self, index):
         if not index in self._pages:
-            data = self.client._get('%s?page=%d&per_page=%d' % (self.url, index, self._per_page))
+            data = self.client._get(_update_qs(self.url, {'page': index, 'per_page': self._per_page}))
             self._pages[index] = [self._transform(item) for item in data[self._list_key]]
         return self._pages[index]
 
@@ -182,7 +196,15 @@ def _transform(self, item):
     def __getitem__(self, index):
         page_index = index / self.per_page + 1
         offset = index % self.per_page
-        page = self.page(page_index)
+
+        try:
+            page = self.page(page_index)
+        except HTTPError, e:
+            if e.status_code == 404:
+                raise IndexError(e.msg)
+            else:
+                raise
+
         return page[offset]
 
     def __len__(self):
@@ -196,9 +218,9 @@ def __iter__(self):
 
 
 class Artist(BaseAPIObject):
-    def __init__(self, client, id):
-        super(Artist, self).__init__(client, id)
-        self.data['resource_url'] = BASE_URL + '/artists/%d' % id
+    def __init__(self, client, dict_):
+        super(Artist, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/artists/%d' % dict_['id']
 
     @property
     def id(self):
@@ -226,7 +248,11 @@ def name_variations(self):
 
     @property
     def aliases(self):
-        return [Artist._from_dict(self.client, d) for d in self.fetch('aliases', [])]
+        return [Artist(self.client, d) for d in self.fetch('aliases', [])]
+
+    @property
+    def members(self):
+        return [Artist(self.client, d) for d in self.fetch('members', [])]
 
     @property
     def urls(self):
@@ -234,16 +260,16 @@ def urls(self):
 
     @property
     def releases(self):
-        return ReleaseList(self.client, self.fetch('releases_url'))
+        return MixedObjectList(self.client, self.fetch('releases_url'), 'releases')
 
     def __repr__(self):
         return '<Artist %r %r>' % (self.id, self.name)
 
 
 class Release(BaseAPIObject):
-    def __init__(self, client, id):
-        super(Release, self).__init__(client, id)
-        self.data['resource_url'] = BASE_URL + '/releases/%d' % id
+    def __init__(self, client, dict_):
+        super(Release, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/releases/%d' % dict_['id']
 
     @property
     def id(self):
@@ -275,24 +301,24 @@ def videos(self):
 
     @property
     def artists(self):
-        return [Artist._from_dict(self.client, d) for d in self.fetch('artists', [])]
+        return [Artist(self.client, d) for d in self.fetch('artists', [])]
 
     @property
     def credits(self):
-        return [Artist._from_dict(self.client, d) for d in self.fetch('extraartists', [])]
+        return [Artist(self.client, d) for d in self.fetch('extraartists', [])]
 
     @property
     def labels(self):
-        return [Label._from_dict(self.client, d) for d in self.fetch('labels', [])]
+        return [Label(self.client, d) for d in self.fetch('labels', [])]
 
     def __repr__(self):
         return '<Release %r %r>' % (self.id, self.title)
 
 
 class Master(BaseAPIObject):
-    def __init__(self, client, id):
-        super(Master, self).__init__(client, id)
-        self.data['resource_url'] = BASE_URL + '/masters/%d' % id
+    def __init__(self, client, dict_):
+        super(Master, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/masters/%d' % dict_['id']
 
     @property
     def id(self):
@@ -306,14 +332,18 @@ def title(self):
     def data_quality(self):
         return self.fetch('data_quality')
 
+    @property
+    def versions(self):
+        return ObjectList(self.client, self.fetch('versions_url'), 'versions', Release)
+
     def __repr__(self):
         return '<Master %r %r>' % (self.id, self.title)
 
 
 class Label(BaseAPIObject):
-    def __init__(self, client, id):
-        super(Label, self).__init__(client, id)
-        self.data['resource_url'] = BASE_URL + '/labels/%d' % id
+    def __init__(self, client, dict_):
+        super(Label, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/labels/%d' % dict_['id']
 
     @property
     def id(self):
@@ -323,15 +353,90 @@ def id(self):
     def name(self):
         return self.fetch('name')
 
+    def __repr__(self):
+        return '<Label %r %r>' % (self.id, self.name)
 
-class ReleaseList(PaginatedList):
-    def __init__(self, client, url):
-        super(ReleaseList, self).__init__(client, url)
-        self._list_key = 'releases'
+
+class User(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(User, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/users/%s' % dict_['username']
+
+    @property
+    def id(self):
+        return self.fetch('id')
+
+    @property
+    def username(self):
+        return self.fetch('username')
+
+    @property
+    def name(self):
+        return self.fetch('name')
+
+    @property
+    def profile(self):
+        return self.fetch('profile')
+
+    @property
+    def location(self):
+        return self.fetch('location')
+
+    @property
+    def home_page(self):
+        return self.fetch('home_page')
+
+    @property
+    def releases_contributed(self):
+        return self.fetch('releases_contributed')
+
+    @property
+    def registered(self):
+        return _parse_timestamp(self.fetch('registered'))
+
+    @property
+    def rating_average(self):
+        return self.fetch('rating_avg')
+
+    @property
+    def num_collection(self):
+        return self.fetch('num_collection')
+
+    @property
+    def num_wantlist(self):
+        return self.fetch('num_wantlist')
+
+    @property
+    def num_lists(self):
+        return self.fetch('num_lists')
+
+    @property
+    def rank(self):
+        return self.fetch('rank')
+
+    def __repr__(self):
+        return '<User %r %r>' % (self.id, self.username)
+
+
+class ObjectList(PaginatedList):
+    """A paginated list of objects of a particular class."""
+    def __init__(self, client, url, key, class_):
+        super(ObjectList, self).__init__(client, url)
+        self._list_key = key
+        self.class_ = class_
+
+    def _transform(self, item):
+        return self.class_(self.client, item)
+
+
+class MixedObjectList(PaginatedList):
+    """A paginated list of objects identified by their type parameter."""
+    def __init__(self, client, url, key):
+        super(MixedObjectList, self).__init__(client, url)
+        self._list_key = key
 
     def _transform(self, item):
-        type = item.get('type', 'release')
-        return CLASS_MAP[type]._from_dict(self.client, item)
+        return CLASS_MAP[item['type']](self.client, item)
 
 
 CLASS_MAP = {

From a0ebae1d0971791c59d5b2ae6b41a7bb1a4c9493 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 3 Nov 2011 10:53:09 -0700
Subject: [PATCH 03/52] Add more unauthenticated objects and break the client
 into modules.

---
 discogs_client/__init__.py                    |   8 +
 discogs_client/client.py                      |  76 ++++
 discogs_client/exceptions.py                  |  24 ++
 discogs_client/helpers.py                     |  11 +
 discogs_client.py => discogs_client/models.py | 385 ++++++++++++------
 5 files changed, 369 insertions(+), 135 deletions(-)
 create mode 100644 discogs_client/__init__.py
 create mode 100644 discogs_client/client.py
 create mode 100644 discogs_client/exceptions.py
 create mode 100644 discogs_client/helpers.py
 rename discogs_client.py => discogs_client/models.py (58%)

diff --git a/discogs_client/__init__.py b/discogs_client/__init__.py
new file mode 100644
index 0000000..3fd1503
--- /dev/null
+++ b/discogs_client/__init__.py
@@ -0,0 +1,8 @@
+__version_info__ = (3,0,0)
+__version__ = '2.0.0'
+
+BASE_URL = 'http://api.discogs.com'
+
+from discogs_client.client import Client
+from discogs_client.models import Artist, Release, Master, Label, User, \
+    Listing, Track, Price, Video
diff --git a/discogs_client/client.py b/discogs_client/client.py
new file mode 100644
index 0000000..2d54c69
--- /dev/null
+++ b/discogs_client/client.py
@@ -0,0 +1,76 @@
+import requests
+import json
+
+from discogs_client import models, BASE_URL
+from discogs_client.exceptions import ConfigurationError, HTTPError
+
+class Client(object):
+    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_key=None):
+        self.user_agent = user_agent
+        self.verbose = False
+
+    def _check_user_agent(self):
+        if self.user_agent:
+            self._headers['user-agent'] = user_agent
+        else:
+            raise ConfigurationError('Invalid or no User-Agent set.')
+
+    def _request(self, method, url, data=None):
+        if self.verbose:
+            print ' '.join((method, url))
+
+        response = requests.request(method, url, data=data)
+
+        if response.status_code == 204:
+            return None
+
+        body = json.loads(response.content)
+
+        if 200 <= response.status_code < 300:
+            return body
+        else:
+            raise HTTPError(body['message'], response.status_code)
+
+    def _get(self, url):
+        return self._request('GET', url)
+
+    def _delete(self, url):
+        return self._request('DELETE', url)
+
+    def _post(self, url, data):
+        return self._request('POST', url, data)
+
+    def _patch(self, url, data):
+        return self._request('PATCH', url, data)
+
+    def _put(self, url, data):
+        return self._request('PUT', url, data)
+
+    def search(self, *query, **fields):
+        if query:
+            fields['q'] = ' '.join(query)
+
+        return models.MixedObjectList(
+            self,
+            _update_qs(BASE_URL + '/database/search', fields),
+            'results'
+        )
+
+    def artist(self, id):
+        return models.Artist(self, {'id': id})
+
+    def release(self, id):
+        return models.Release(self, {'id': id})
+
+    def master(self, id):
+        return models.Master(self, {'id': id})
+
+    def label(self, id):
+        return models.Label(self, {'id': id})
+
+    def user(self, username):
+        return models.User(self, {'username': username})
+
+    def listing(self, id):
+        return models.Listing(self, {'id': id})
+
diff --git a/discogs_client/exceptions.py b/discogs_client/exceptions.py
new file mode 100644
index 0000000..1d2635a
--- /dev/null
+++ b/discogs_client/exceptions.py
@@ -0,0 +1,24 @@
+import httplib
+
+class DiscogsAPIError(Exception):
+    """Root Exception class for Discogs API errors."""
+    pass
+
+
+class ConfigurationError(DiscogsAPIError):
+    """Exception class for problems with the configuration of this client."""
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
+
+class HTTPError(DiscogsAPIError):
+    """Exception class for HTTP errors."""
+    def __init__(self, message, code):
+        self.status_code = code
+        self.msg = '{} {}: {}'.format(code, httplib.responses[code], message)
+
+    def __str__(self):
+        return self.msg
diff --git a/discogs_client/helpers.py b/discogs_client/helpers.py
new file mode 100644
index 0000000..999fe44
--- /dev/null
+++ b/discogs_client/helpers.py
@@ -0,0 +1,11 @@
+from datetime import datetime
+
+def parse_timestamp(timestamp):
+    """Convert an ISO 8601 timestamp into a datetime."""
+    return datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S')
+
+def update_qs(url, params):
+    """A not-very-intelligent function to glom parameters onto a query string."""
+    joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
+    separator = '&' if '?' in url else '?'
+    return url + separator + joined_qs
diff --git a/discogs_client.py b/discogs_client/models.py
similarity index 58%
rename from discogs_client.py
rename to discogs_client/models.py
index 9d0e7c5..7a550cf 100644
--- a/discogs_client.py
+++ b/discogs_client/models.py
@@ -1,119 +1,6 @@
-__version_info__ = (2,0,0)
-__version__ = '2.0.0'
-
-import requests
-import json
-import urllib
-import httplib
-import urlparse
-from datetime import datetime
-from collections import defaultdict
-
-BASE_URL = 'http://api.discogs.com'
-
-
-def _parse_timestamp(timestamp):
-    """Convert an ISO 8601 timestamp into a datetime."""
-    return datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S')
-
-
-def _update_qs(url, params):
-    """A not-very-intelligent function to glom parameters onto a query string."""
-    joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
-    separator = '&' if '?' in url else '?'
-    return url + separator + joined_qs
-
-
-class DiscogsAPIError(Exception):
-    """Root Exception class for Discogs API errors."""
-    pass
-
-
-class ConfigurationError(DiscogsAPIError):
-    """Exception class for problems with the configuration of this client."""
-    def __init__(self, msg):
-        self.msg = msg
-
-    def __str__(self):
-        return self.msg
-
-
-class HTTPError(DiscogsAPIError):
-    """Exception class for HTTP errors."""
-    def __init__(self, message, code):
-        self.status_code = code
-        self.msg = '{} {}: {}'.format(code, httplib.responses[code], message)
-
-    def __str__(self):
-        return self.msg
-
-
-class Client(object):
-    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_key=None):
-        self.user_agent = user_agent
-        self.verbose = False
-
-    def _check_user_agent(self):
-        if self.user_agent:
-            self._headers['user-agent'] = user_agent
-        else:
-            raise ConfigurationError("Invalid or no User-Agent set.")
-
-    def _request(self, method, url, data=None):
-        if self.verbose:
-            print ' '.join((method, url))
-
-        response = requests.request(method, url, data=data)
-
-        if response.status_code == 204:
-            return None
-
-        body = json.loads(response.content)
-
-        if 200 <= response.status_code < 300:
-            return body
-        else:
-            raise HTTPError(body['message'], response.status_code)
-
-    def _get(self, url):
-        return self._request('GET', url)
-
-    def _delete(self, url):
-        return self._request('DELETE', url)
-
-    def _post(self, url, data):
-        return self._request('POST', url, data)
-
-    def _patch(self, url, data):
-        return self._request('PATCH', url, data)
-
-    def _put(self, url, data):
-        return self._request('PUT', url, data)
-
-    def search(self, query):
-        # TODO: Other filtering parameters
-        # TODO: Alias q to ql on the server side
-        return MixedObjectList(
-            self,
-            _update_qs(BASE_URL + '/database/search', {'ql': query}),
-            'results'
-        )
-
-    def artist(self, id):
-        return Artist(self, {'id': id})
-
-    def release(self, id):
-        return Release(self, {'id': id})
-
-    def master(self, id):
-        return Master(self, {'id': id})
-
-    def label(self, id):
-        return Label(self, {'id': id})
-
-    def user(self, username):
-        return User(self, {'username': username})
-
+from discogs_client import BASE_URL
+from discogs_client.exceptions import HTTPError
+from discogs_client.helpers import parse_timestamp, update_qs
 
 class BaseAPIObject(object):
     def __init__(self, client, dict_):
@@ -143,6 +30,15 @@ def fetch(self, key, default=None):
                 return default
 
 
+# This is terribly cheesy, but makes the client API more consistent
+class SecondaryAPIObject(object):
+    def __init__(self, dict_):
+        self.data = dict_
+
+    def fetch(self, key, default=None):
+        return self.data.get(key, default)
+
+
 class PaginatedList(object):
     def __init__(self, client, url):
         self.client = client
@@ -168,7 +64,7 @@ def _invalidate(self):
         self._num_items = None
 
     def _load_pagination_info(self):
-        data = self.client._get(_update_qs(self.url, {'page': 1, 'per_page': self._per_page}))
+        data = self.client._get(update_qs(self.url, {'page': 1, 'per_page': self._per_page}))
         self._num_pages = data['pagination']['pages']
         self._num_items = data['pagination']['items']
 
@@ -186,7 +82,7 @@ def count(self):
 
     def page(self, index):
         if not index in self._pages:
-            data = self.client._get(_update_qs(self.url, {'page': index, 'per_page': self._per_page}))
+            data = self.client._get(update_qs(self.url, {'page': index, 'per_page': self._per_page}))
             self._pages[index] = [self._transform(item) for item in data[self._list_key]]
         return self._pages[index]
 
@@ -217,6 +113,33 @@ def __iter__(self):
                 yield item
 
 
+class ObjectList(PaginatedList):
+    """A paginated list of objects of a particular class."""
+    def __init__(self, client, url, key, class_):
+        super(ObjectList, self).__init__(client, url)
+        self._list_key = key
+        self.class_ = class_
+
+    def _transform(self, item):
+        return self.class_(self.client, item)
+
+
+class MixedObjectList(PaginatedList):
+    """A paginated list of objects identified by their type parameter."""
+    def __init__(self, client, url, key):
+        super(MixedObjectList, self).__init__(client, url)
+        self._list_key = key
+
+    def _transform(self, item):
+        # In some cases, we want to map the 'title' key we get back in search
+        # results to 'name'. This way, you can repr() a page of search results
+        # without making 50 requests.
+        if item['type'] in ('label', 'artist'):
+            item['name'] = item['title']
+
+        return CLASS_MAP[item['type']](self.client, item)
+
+
 class Artist(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
@@ -297,7 +220,27 @@ def status(self):
 
     @property
     def videos(self):
-        return self.fetch('videos')
+        return [Video(d) for d in self.fetch('videos', [])]
+
+    @property
+    def genres(self):
+        return self.fetch('genres')
+
+    @property
+    def country(self):
+        return self.fetch('country')
+
+    @property
+    def notes(self):
+        return self.fetch('notes')
+
+    @property
+    def formats(self):
+        return self.fetch('formats')
+
+    @property
+    def tracklist(self):
+        return [Track(d) for d in self.fetch('tracklist', [])]
 
     @property
     def artists(self):
@@ -311,6 +254,18 @@ def credits(self):
     def labels(self):
         return [Label(self.client, d) for d in self.fetch('labels', [])]
 
+    @property
+    def companies(self):
+        return [Label(self.client, d) for d in self.fetch('companies', [])]
+
+    @property
+    def master(self):
+        master_id = self.fetch('master_id')
+        if master_id:
+            return Master(self.client, {'id': master_id})
+        else:
+            return None
+
     def __repr__(self):
         return '<Release %r %r>' % (self.id, self.title)
 
@@ -336,6 +291,30 @@ def data_quality(self):
     def versions(self):
         return ObjectList(self.client, self.fetch('versions_url'), 'versions', Release)
 
+    @property
+    def styles(self):
+        return self.fetch('styles')
+
+    @property
+    def genres(self):
+        return self.fetch('genres')
+
+    @property
+    def videos(self):
+        return [Video(d) for d in self.fetch('videos', [])]
+
+    @property
+    def main_release(self):
+        return Release(self.client, {'id': self.fetch('main_release')})
+
+    @property
+    def tracklist(self):
+        return [Track(d) for d in self.fetch('tracklist', [])]
+
+    @property
+    def images(self):
+        return self.fetch('images')
+
     def __repr__(self):
         return '<Master %r %r>' % (self.id, self.title)
 
@@ -353,6 +332,42 @@ def id(self):
     def name(self):
         return self.fetch('name')
 
+    @property
+    def profile(self):
+        return self.fetch('profile')
+
+    @property
+    def urls(self):
+        return self.fetch('urls')
+
+    @property
+    def images(self):
+        return self.fetch('images')
+
+    @property
+    def contact_info(self):
+        return self.fetch('contact_info')
+
+    @property
+    def data_quality(self):
+        return self.fetch('data_quality')
+
+    @property
+    def releases(self):
+        return ObjectList(self.client, self.fetch('releases_url'), 'releases', Release)
+
+    @property
+    def sublabels(self):
+        return [Label(self.client, d) for d in self.fetch('sublabels', [])]
+
+    @property
+    def parent_label(self):
+        parent_label_dict = self.fetch('parent_label')
+        if parent_label_dict:
+            return Label(self.client, parent_label_dict)
+        else:
+            return None
+
     def __repr__(self):
         return '<Label %r %r>' % (self.id, self.name)
 
@@ -392,7 +407,7 @@ def releases_contributed(self):
 
     @property
     def registered(self):
-        return _parse_timestamp(self.fetch('registered'))
+        return parse_timestamp(self.fetch('registered'))
 
     @property
     def rating_average(self):
@@ -410,6 +425,10 @@ def num_wantlist(self):
     def num_lists(self):
         return self.fetch('num_lists')
 
+    @property
+    def inventory(self):
+        return ObjectList(self.client, self.fetch('inventory_url'), 'listings', Listing)
+
     @property
     def rank(self):
         return self.fetch('rank')
@@ -418,25 +437,121 @@ def __repr__(self):
         return '<User %r %r>' % (self.id, self.username)
 
 
-class ObjectList(PaginatedList):
-    """A paginated list of objects of a particular class."""
-    def __init__(self, client, url, key, class_):
-        super(ObjectList, self).__init__(client, url)
-        self._list_key = key
-        self.class_ = class_
+class Listing(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(Listing, self).__init__(client, dict_)
+        self.data['resource_url'] = BASE_URL + '/marketplace/listings/%d' % dict_['id']
 
-    def _transform(self, item):
-        return self.class_(self.client, item)
+    @property
+    def id(self):
+        return self.fetch('id')
 
+    @property
+    def status(self):
+        return self.fetch('status')
 
-class MixedObjectList(PaginatedList):
-    """A paginated list of objects identified by their type parameter."""
-    def __init__(self, client, url, key):
-        super(MixedObjectList, self).__init__(client, url)
-        self._list_key = key
+    @property
+    def price(self):
+        return Price(self.fetch('price', {}))
 
-    def _transform(self, item):
-        return CLASS_MAP[item['type']](self.client, item)
+    @property
+    def allow_offers(self):
+        return self.fetch('allow_offers')
+
+    @property
+    def condition(self):
+        return self.fetch('condition')
+
+    @property
+    def sleeve_condition(self):
+        return self.fetch('sleeve_condition')
+
+    @property
+    def ships_from(self):
+        return self.fetch('ships_from')
+
+    @property
+    def comments(self):
+        return self.fetch('comments')
+
+    @property
+    def audio(self):
+        return self.fetch('audio')
+
+    @property
+    def posted(self):
+        return parse_timestamp(self.fetch('posted'))
+
+    @property
+    def release(self):
+        return Release(self.client, self.fetch('release'))
+
+    @property
+    def seller(self):
+        return User(self.client, self.fetch('seller'))
+
+    def __repr__(self):
+        return '<Listing %r %r>' % (self.id, self.release.data['description'])
+
+
+class Track(SecondaryAPIObject):
+    @property
+    def duration(self):
+        return self.fetch('duration')
+
+    @property
+    def position(self):
+        return self.fetch('position')
+
+    @property
+    def title(self):
+        return self.fetch('title')
+
+    @property
+    def credits(self):
+        return [Artist(self.client, d) for d in self.fetch('extraartists', [])]
+
+    def __repr__(self):
+        return '<Track %r %r>' % (self.position, self.title)
+
+
+class Price(SecondaryAPIObject):
+    @property
+    def currency(self):
+        return self.fetch('currency')
+
+    @property
+    def value(self):
+        return self.fetch('value')
+
+    def __repr__(self):
+        return '<Price %r %r>' % (self.value, self.currency)
+
+
+class Video(SecondaryAPIObject):
+    @property
+    def duration(self):
+        return self.fetch('duration')
+
+    @property
+    def embed(self):
+        return self.fetch('embed')
+
+    @property
+    def title(self):
+        return self.fetch('title')
+
+    # The API returns this as 'uri' :\
+    @property
+    def url(self):
+        return self.fetch('uri')
+
+    @property
+    def description(self):
+        return self.fetch('description')
+
+    def __repr__(self):
+        return '<Video %r>' % (self.title)
 
 
 CLASS_MAP = {

From eb349a50220fd677ce19a625491a48f62dd392c8 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 3 Nov 2011 14:54:34 -0700
Subject: [PATCH 04/52] Add initial support for OAuth requests.

---
 discogs_client/__init__.py   |  4 +-
 discogs_client/client.py     | 90 +++++++++++++++++++++++++++++++++---
 discogs_client/exceptions.py |  4 +-
 discogs_client/models.py     | 73 +++++++++++++++++++++++++----
 4 files changed, 151 insertions(+), 20 deletions(-)

diff --git a/discogs_client/__init__.py b/discogs_client/__init__.py
index 3fd1503..d2b3735 100644
--- a/discogs_client/__init__.py
+++ b/discogs_client/__init__.py
@@ -1,7 +1,7 @@
-__version_info__ = (3,0,0)
+__version_info__ = (2,0,0)
 __version__ = '2.0.0'
 
-BASE_URL = 'http://api.discogs.com'
+BASE_URL = 'http://appdev1.prod.discogs.com:8086'
 
 from discogs_client.client import Client
 from discogs_client.models import Artist, Release, Master, Label, User, \
diff --git a/discogs_client/client.py b/discogs_client/client.py
index 2d54c69..a43e1f8 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -1,13 +1,73 @@
 import requests
 import json
+import oauth2
+import urllib
+import urlparse
 
 from discogs_client import models, BASE_URL
 from discogs_client.exceptions import ConfigurationError, HTTPError
 
+REQUEST_TOKEN_URL = BASE_URL + '/oauth/request_token'
+AUTHORIZE_URL = 'http://appdev1.prod.discogs.com:8085/oauth/authorize'
+ACCESS_TOKEN_URL = BASE_URL + '/oauth/access_token'
+
 class Client(object):
-    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_key=None):
+    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_token=None, access_secret=None):
         self.user_agent = user_agent
         self.verbose = False
+        self.authenticated = False
+
+        self._consumer = None
+        self._oauth_client = None
+        self._token = None
+
+        if consumer_key and consumer_secret:
+            self._consumer = oauth2.Consumer(consumer_key, consumer_secret)
+
+            if access_token and access_secret:
+                self._token = oauth2.Token(access_token, access_secret)
+                self.authenticated = True
+
+            self._oauth_client = oauth2.Client(self._consumer, self._token)
+
+    def get_authorize_url(self, callback_url=None):
+        # Forget existing tokens
+        self._oauth_client = oauth2.Client(self._consumer)
+
+        params = {}
+        if callback_url:
+            params['oauth_callback'] = callback_url
+        postdata = urllib.urlencode(params)
+
+        resp, content = self._oauth_client.request(REQUEST_TOKEN_URL, 'POST', body=postdata)
+        if resp['status'] != '200':
+            raise HTTPError('Invalid response from request token URL.', int(resp['status']))
+        self._token = dict(urlparse.parse_qsl(content))
+
+        params = {'oauth_token': self._token['oauth_token']}
+        query_string = urllib.urlencode(params)
+
+        return '?'.join((AUTHORIZE_URL, query_string))
+
+    def get_access_token(self, verifier):
+        token = oauth2.Token(
+            self._token['oauth_token'],
+            self._token['oauth_token_secret'],
+        )
+        token.set_verifier(verifier)
+        self._oauth_client = oauth2.Client(self._consumer, token)
+
+        resp, content = self._oauth_client.request(ACCESS_TOKEN_URL, 'POST')
+        self._token = dict(urlparse.parse_qsl(content))
+
+        token = oauth2.Token(
+            self._token['oauth_token'],
+            self._token['oauth_token_secret'],
+        )
+        self._oauth_client = oauth2.Client(self._consumer, token)
+        self.authenticated = True
+
+        return self._token['oauth_token'], self._token['oauth_token_secret']
 
     def _check_user_agent(self):
         if self.user_agent:
@@ -19,17 +79,27 @@ def _request(self, method, url, data=None):
         if self.verbose:
             print ' '.join((method, url))
 
-        response = requests.request(method, url, data=data)
+        if self.authenticated:
+            if data:
+                body = urllib.urlencode(data)
+                resp, content = self._oauth_client.request(url, method, body)
+            else:
+                resp, content = self._oauth_client.request(url, method)
+            status_code = int(resp['status'])
+        else:
+            response = requests.request(method, url, data=data)
+            content = response.content
+            status_code = response.status_code
 
-        if response.status_code == 204:
+        if status_code == 204:
             return None
 
-        body = json.loads(response.content)
+        body = json.loads(content)
 
-        if 200 <= response.status_code < 300:
+        if 200 <= status_code < 300:
             return body
         else:
-            raise HTTPError(body['message'], response.status_code)
+            raise HTTPError(body['message'], status_code)
 
     def _get(self, url):
         return self._request('GET', url)
@@ -74,3 +144,11 @@ def user(self, username):
     def listing(self, id):
         return models.Listing(self, {'id': id})
 
+    def identity(self):
+        resp = self._get(BASE_URL + '/oauth/identity')
+        return models.User(self, resp)
+
+    def fee_for(self, price, currency='USD'):
+        resp = self._get(BASE_URL + '/marketplace/fee/%f/%s' % (float(price), currency))
+        return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
+
diff --git a/discogs_client/exceptions.py b/discogs_client/exceptions.py
index 1d2635a..cab2000 100644
--- a/discogs_client/exceptions.py
+++ b/discogs_client/exceptions.py
@@ -1,5 +1,3 @@
-import httplib
-
 class DiscogsAPIError(Exception):
     """Root Exception class for Discogs API errors."""
     pass
@@ -18,7 +16,7 @@ class HTTPError(DiscogsAPIError):
     """Exception class for HTTP errors."""
     def __init__(self, message, code):
         self.status_code = code
-        self.msg = '{} {}: {}'.format(code, httplib.responses[code], message)
+        self.msg = '{}: {}'.format(code, message)
 
     def __str__(self):
         return self.msg
diff --git a/discogs_client/models.py b/discogs_client/models.py
index 7a550cf..bd8fd5a 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -3,6 +3,7 @@
 from discogs_client.helpers import parse_timestamp, update_qs
 
 class BaseAPIObject(object):
+    """A first-order API object that has a canonical endpoint of its own."""
     def __init__(self, client, dict_):
         self.data = dict_
         self.client = client
@@ -13,6 +14,11 @@ def refresh(self):
             data = self.client._get(self.data['resource_url'])
             self.data.update(data)
 
+    # TODO: This needs to use the oauth2 client
+    def delete(self):
+        if self.data.get('resource_url'):
+            self.client._delete(self.data['resource_url'])
+
     def fetch(self, key, default=None):
         if key in self._known_invalid_keys:
             return default
@@ -32,7 +38,12 @@ def fetch(self, key, default=None):
 
 # This is terribly cheesy, but makes the client API more consistent
 class SecondaryAPIObject(object):
-    def __init__(self, dict_):
+    """
+    An object that wraps parts of a response and doesn't have its own
+    endpoint.
+    """
+    def __init__(self, client, dict_):
+        self.client = client
         self.data = dict_
 
     def fetch(self, key, default=None):
@@ -40,6 +51,7 @@ def fetch(self, key, default=None):
 
 
 class PaginatedList(object):
+    """Base class for lists of objects spread across many URLs."""
     def __init__(self, client, url):
         self.client = client
         self.url = url
@@ -64,7 +76,9 @@ def _invalidate(self):
         self._num_items = None
 
     def _load_pagination_info(self):
-        data = self.client._get(update_qs(self.url, {'page': 1, 'per_page': self._per_page}))
+        data = self.client._get(
+            update_qs(self.url, {'page': 1, 'per_page': self._per_page})
+        )
         self._num_pages = data['pagination']['pages']
         self._num_items = data['pagination']['items']
 
@@ -82,8 +96,12 @@ def count(self):
 
     def page(self, index):
         if not index in self._pages:
-            data = self.client._get(update_qs(self.url, {'page': index, 'per_page': self._per_page}))
-            self._pages[index] = [self._transform(item) for item in data[self._list_key]]
+            data = self.client._get(
+                update_qs(self.url, {'page': index, 'per_page': self._per_page})
+            )
+            self._pages[index] = [
+                self._transform(item) for item in data[self._list_key]
+            ]
         return self._pages[index]
 
     def _transform(self, item):
@@ -220,7 +238,7 @@ def status(self):
 
     @property
     def videos(self):
-        return [Video(d) for d in self.fetch('videos', [])]
+        return [Video(self.client, d) for d in self.fetch('videos', [])]
 
     @property
     def genres(self):
@@ -240,7 +258,7 @@ def formats(self):
 
     @property
     def tracklist(self):
-        return [Track(d) for d in self.fetch('tracklist', [])]
+        return [Track(self.client, d) for d in self.fetch('tracklist', [])]
 
     @property
     def artists(self):
@@ -301,7 +319,7 @@ def genres(self):
 
     @property
     def videos(self):
-        return [Video(d) for d in self.fetch('videos', [])]
+        return [Video(self.client, d) for d in self.fetch('videos', [])]
 
     @property
     def main_release(self):
@@ -309,7 +327,7 @@ def main_release(self):
 
     @property
     def tracklist(self):
-        return [Track(d) for d in self.fetch('tracklist', [])]
+        return [Track(self.client, d) for d in self.fetch('tracklist', [])]
 
     @property
     def images(self):
@@ -429,6 +447,10 @@ def num_lists(self):
     def inventory(self):
         return ObjectList(self.client, self.fetch('inventory_url'), 'listings', Listing)
 
+    @property
+    def wantlist(self):
+        return ObjectList(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
+
     @property
     def rank(self):
         return self.fetch('rank')
@@ -437,6 +459,34 @@ def __repr__(self):
         return '<User %r %r>' % (self.id, self.username)
 
 
+class WantlistItem(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(WantlistItem, self).__init__(client, dict_)
+
+    @property
+    def id(self):
+        return self.fetch('id')
+
+    @property
+    def rating(self):
+        return self.fetch('rating')
+
+    @property
+    def notes(self):
+        return self.fetch('notes')
+
+    @property
+    def notes_public(self):
+        return self.fetch('notes_public')
+
+    @property
+    def release(self):
+        return Release(self.client, self.fetch('basic_information'))
+
+    def __repr__(self):
+        return '<WantlistItem %r %r>' % (self.id, self.release.title)
+
+
 class Listing(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)
@@ -452,7 +502,7 @@ def status(self):
 
     @property
     def price(self):
-        return Price(self.fetch('price', {}))
+        return Price(self.client, self.fetch('price', {}))
 
     @property
     def allow_offers(self):
@@ -507,6 +557,10 @@ def position(self):
     def title(self):
         return self.fetch('title')
 
+    @property
+    def artists(self):
+        return [Artist(self.client, d) for d in self.fetch('artists', [])]
+
     @property
     def credits(self):
         return [Artist(self.client, d) for d in self.fetch('extraartists', [])]
@@ -554,6 +608,7 @@ def __repr__(self):
         return '<Video %r>' % (self.title)
 
 
+# Only things that can show up in a MixedObjectList need to go here
 CLASS_MAP = {
     'artist': Artist,
     'release': Release,

From 366b88c9ab18d77b4524d3bbd465c5f0cb1ea8f9 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 15:16:57 -0800
Subject: [PATCH 05/52] Make URLs configurable per-client.

---
 discogs_client/__init__.py |  2 --
 discogs_client/client.py   | 28 ++++++++++++++--------------
 discogs_client/models.py   | 13 ++++++-------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/discogs_client/__init__.py b/discogs_client/__init__.py
index d2b3735..ba9af57 100644
--- a/discogs_client/__init__.py
+++ b/discogs_client/__init__.py
@@ -1,8 +1,6 @@
 __version_info__ = (2,0,0)
 __version__ = '2.0.0'
 
-BASE_URL = 'http://appdev1.prod.discogs.com:8086'
-
 from discogs_client.client import Client
 from discogs_client.models import Artist, Release, Master, Label, User, \
     Listing, Track, Price, Video
diff --git a/discogs_client/client.py b/discogs_client/client.py
index a43e1f8..a620c51 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -4,14 +4,15 @@
 import urllib
 import urlparse
 
-from discogs_client import models, BASE_URL
+from discogs_client import models
 from discogs_client.exceptions import ConfigurationError, HTTPError
 
-REQUEST_TOKEN_URL = BASE_URL + '/oauth/request_token'
-AUTHORIZE_URL = 'http://appdev1.prod.discogs.com:8085/oauth/authorize'
-ACCESS_TOKEN_URL = BASE_URL + '/oauth/access_token'
-
 class Client(object):
+    _base_url = 'http://api.discogs.com'
+    _request_token_url = 'http://api.discogs.com/oauth/request_token'
+    _authorize_url = 'http://www.discogs.com/oauth/authorize'
+    _access_token_url = 'http://api.discogs.com/oauth/access_token'
+
     def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_token=None, access_secret=None):
         self.user_agent = user_agent
         self.verbose = False
@@ -39,7 +40,7 @@ def get_authorize_url(self, callback_url=None):
             params['oauth_callback'] = callback_url
         postdata = urllib.urlencode(params)
 
-        resp, content = self._oauth_client.request(REQUEST_TOKEN_URL, 'POST', body=postdata)
+        resp, content = self._oauth_client.request(self._request_token_url, 'POST', body=postdata)
         if resp['status'] != '200':
             raise HTTPError('Invalid response from request token URL.', int(resp['status']))
         self._token = dict(urlparse.parse_qsl(content))
@@ -47,7 +48,7 @@ def get_authorize_url(self, callback_url=None):
         params = {'oauth_token': self._token['oauth_token']}
         query_string = urllib.urlencode(params)
 
-        return '?'.join((AUTHORIZE_URL, query_string))
+        return '?'.join((self._authorize_url, query_string))
 
     def get_access_token(self, verifier):
         token = oauth2.Token(
@@ -57,7 +58,7 @@ def get_access_token(self, verifier):
         token.set_verifier(verifier)
         self._oauth_client = oauth2.Client(self._consumer, token)
 
-        resp, content = self._oauth_client.request(ACCESS_TOKEN_URL, 'POST')
+        resp, content = self._oauth_client.request(self._access_token_url, 'POST')
         self._token = dict(urlparse.parse_qsl(content))
 
         token = oauth2.Token(
@@ -122,7 +123,7 @@ def search(self, *query, **fields):
 
         return models.MixedObjectList(
             self,
-            _update_qs(BASE_URL + '/database/search', fields),
+            update_qs(self._base_url + '/database/search', fields),
             'results'
         )
 
@@ -144,11 +145,10 @@ def user(self, username):
     def listing(self, id):
         return models.Listing(self, {'id': id})
 
-    def identity(self):
-        resp = self._get(BASE_URL + '/oauth/identity')
-        return models.User(self, resp)
-
     def fee_for(self, price, currency='USD'):
-        resp = self._get(BASE_URL + '/marketplace/fee/%f/%s' % (float(price), currency))
+        resp = self._get(self._base_url + '/marketplace/fee/%f/%s' % (float(price), currency))
         return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
 
+    def identity(self):
+        resp = self._get(self._base_url + '/oauth/identity')
+        return models.User(self, resp)
diff --git a/discogs_client/models.py b/discogs_client/models.py
index bd8fd5a..e6b875a 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -1,4 +1,3 @@
-from discogs_client import BASE_URL
 from discogs_client.exceptions import HTTPError
 from discogs_client.helpers import parse_timestamp, update_qs
 
@@ -161,7 +160,7 @@ def _transform(self, item):
 class Artist(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/artists/%d' % dict_['id']
+        self.data['resource_url'] = client._base_url + '/artists/%d' % dict_['id']
 
     @property
     def id(self):
@@ -210,7 +209,7 @@ def __repr__(self):
 class Release(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Release, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/releases/%d' % dict_['id']
+        self.data['resource_url'] = client._base_url + '/releases/%d' % dict_['id']
 
     @property
     def id(self):
@@ -291,7 +290,7 @@ def __repr__(self):
 class Master(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Master, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/masters/%d' % dict_['id']
+        self.data['resource_url'] = client._base_url + '/masters/%d' % dict_['id']
 
     @property
     def id(self):
@@ -340,7 +339,7 @@ def __repr__(self):
 class Label(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Label, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/labels/%d' % dict_['id']
+        self.data['resource_url'] = client._base_url + '/labels/%d' % dict_['id']
 
     @property
     def id(self):
@@ -393,7 +392,7 @@ def __repr__(self):
 class User(BaseAPIObject):
     def __init__(self, client, dict_):
         super(User, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/users/%s' % dict_['username']
+        self.data['resource_url'] = client._base_url + '/users/%s' % dict_['username']
 
     @property
     def id(self):
@@ -490,7 +489,7 @@ def __repr__(self):
 class Listing(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)
-        self.data['resource_url'] = BASE_URL + '/marketplace/listings/%d' % dict_['id']
+        self.data['resource_url'] = client._base_url + '/marketplace/listings/%d' % dict_['id']
 
     @property
     def id(self):

From e5e8f20350ccc8d62072c10ff2f52cf3cc914389 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 15:18:54 -0800
Subject: [PATCH 06/52] Fix headers not being supplied correctly.

---
 discogs_client/client.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index a620c51..5b383e2 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -71,24 +71,30 @@ def get_access_token(self, verifier):
         return self._token['oauth_token'], self._token['oauth_token_secret']
 
     def _check_user_agent(self):
-        if self.user_agent:
-            self._headers['user-agent'] = user_agent
-        else:
+        if not self.user_agent:
             raise ConfigurationError('Invalid or no User-Agent set.')
 
     def _request(self, method, url, data=None):
         if self.verbose:
             print ' '.join((method, url))
 
+        headers = {
+            'Accept-Encoding': 'gzip',
+            'User-Agent': self.user_agent,
+        }
+
+        if data:
+            headers['Content-Type'] = 'application/json'
+
         if self.authenticated:
             if data:
-                body = urllib.urlencode(data)
-                resp, content = self._oauth_client.request(url, method, body)
+                body = json.dumps(data)
+                resp, content = self._oauth_client.request(url, method, body, headers=headers)
             else:
-                resp, content = self._oauth_client.request(url, method)
+                resp, content = self._oauth_client.request(url, method, headers=headers)
             status_code = int(resp['status'])
         else:
-            response = requests.request(method, url, data=data)
+            response = requests.request(method, url, data=data, headers=headers)
             content = response.content
             status_code = response.status_code
 

From 623c90672a2d28c5d9d46db16d59345f4661891d Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 15:23:20 -0800
Subject: [PATCH 07/52] Rename paginated list classes for clarity.

---
 discogs_client/client.py |  2 +-
 discogs_client/models.py | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index 5b383e2..0e12891 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -127,7 +127,7 @@ def search(self, *query, **fields):
         if query:
             fields['q'] = ' '.join(query)
 
-        return models.MixedObjectList(
+        return models.MixedPaginatedList(
             self,
             update_qs(self._base_url + '/database/search', fields),
             'results'
diff --git a/discogs_client/models.py b/discogs_client/models.py
index e6b875a..25cc65e 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -49,7 +49,7 @@ def fetch(self, key, default=None):
         return self.data.get(key, default)
 
 
-class PaginatedList(object):
+class BasePaginatedResponse(object):
     """Base class for lists of objects spread across many URLs."""
     def __init__(self, client, url):
         self.client = client
@@ -130,10 +130,10 @@ def __iter__(self):
                 yield item
 
 
-class ObjectList(PaginatedList):
+class PaginatedList(BasePaginatedResponse):
     """A paginated list of objects of a particular class."""
     def __init__(self, client, url, key, class_):
-        super(ObjectList, self).__init__(client, url)
+        super(PaginatedList, self).__init__(client, url)
         self._list_key = key
         self.class_ = class_
 
@@ -141,10 +141,10 @@ def _transform(self, item):
         return self.class_(self.client, item)
 
 
-class MixedObjectList(PaginatedList):
+class MixedPaginatedList(BasePaginatedResponse):
     """A paginated list of objects identified by their type parameter."""
     def __init__(self, client, url, key):
-        super(MixedObjectList, self).__init__(client, url)
+        super(MixedPaginatedList, self).__init__(client, url)
         self._list_key = key
 
     def _transform(self, item):
@@ -200,7 +200,7 @@ def urls(self):
 
     @property
     def releases(self):
-        return MixedObjectList(self.client, self.fetch('releases_url'), 'releases')
+        return MixedPaginatedList(self.client, self.fetch('releases_url'), 'releases')
 
     def __repr__(self):
         return '<Artist %r %r>' % (self.id, self.name)
@@ -306,7 +306,7 @@ def data_quality(self):
 
     @property
     def versions(self):
-        return ObjectList(self.client, self.fetch('versions_url'), 'versions', Release)
+        return PaginatedList(self.client, self.fetch('versions_url'), 'versions', Release)
 
     @property
     def styles(self):
@@ -371,7 +371,7 @@ def data_quality(self):
 
     @property
     def releases(self):
-        return ObjectList(self.client, self.fetch('releases_url'), 'releases', Release)
+        return PaginatedList(self.client, self.fetch('releases_url'), 'releases', Release)
 
     @property
     def sublabels(self):
@@ -444,11 +444,11 @@ def num_lists(self):
 
     @property
     def inventory(self):
-        return ObjectList(self.client, self.fetch('inventory_url'), 'listings', Listing)
+        return PaginatedList(self.client, self.fetch('inventory_url'), 'listings', Listing)
 
     @property
     def wantlist(self):
-        return ObjectList(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
+        return Wantlist(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
 
     @property
     def rank(self):
@@ -607,7 +607,7 @@ def __repr__(self):
         return '<Video %r>' % (self.title)
 
 
-# Only things that can show up in a MixedObjectList need to go here
+# Only things that can show up in a MixedPaginatedList need to go here
 CLASS_MAP = {
     'artist': Artist,
     'release': Release,

From 4729a3ca1b934edc5f89261d7ab23467c7096b1f Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 15:25:51 -0800
Subject: [PATCH 08/52] Add artist groups.

---
 discogs_client/models.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 25cc65e..ff3d138 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -194,6 +194,10 @@ def aliases(self):
     def members(self):
         return [Artist(self.client, d) for d in self.fetch('members', [])]
 
+    @property
+    def groups(self):
+        return [Artist(self.client, d) for d in self.fetch('groups', [])]
+
     @property
     def urls(self):
         return self.fetch('urls')

From 24e77671b3f462dd717b81f6fc39b2f2c2c01ada Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 16:00:23 -0800
Subject: [PATCH 09/52] Fix missing import.

---
 discogs_client/client.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index 0e12891..1aee3ca 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -6,6 +6,7 @@
 
 from discogs_client import models
 from discogs_client.exceptions import ConfigurationError, HTTPError
+from discogs_client.helpers import update_qs
 
 class Client(object):
     _base_url = 'http://api.discogs.com'

From d8e7685af2d2f467848ab1cdda400a96bf6709b5 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Mon, 21 Nov 2011 16:01:06 -0800
Subject: [PATCH 10/52] wip: start on manipulation of remote objects

---
 discogs_client/exceptions.py |   2 +-
 discogs_client/helpers.py    |   3 +
 discogs_client/models.py     | 121 ++++++++++++++++++++++++++++++++---
 3 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/discogs_client/exceptions.py b/discogs_client/exceptions.py
index cab2000..3c0bb59 100644
--- a/discogs_client/exceptions.py
+++ b/discogs_client/exceptions.py
@@ -16,7 +16,7 @@ class HTTPError(DiscogsAPIError):
     """Exception class for HTTP errors."""
     def __init__(self, message, code):
         self.status_code = code
-        self.msg = '{}: {}'.format(code, message)
+        self.msg = '%d: %s' % (code, message)
 
     def __str__(self):
         return self.msg
diff --git a/discogs_client/helpers.py b/discogs_client/helpers.py
index 999fe44..d371837 100644
--- a/discogs_client/helpers.py
+++ b/discogs_client/helpers.py
@@ -9,3 +9,6 @@ def update_qs(url, params):
     joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
     separator = '&' if '?' in url else '?'
     return url + separator + joined_qs
+
+def omit_none(dict_):
+    return dict((k, v) for k, v in dict_.iteritems() if v is not None)
diff --git a/discogs_client/models.py b/discogs_client/models.py
index ff3d138..659b33a 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -1,5 +1,5 @@
 from discogs_client.exceptions import HTTPError
-from discogs_client.helpers import parse_timestamp, update_qs
+from discogs_client.helpers import parse_timestamp, update_qs, omit_none
 
 class BaseAPIObject(object):
     """A first-order API object that has a canonical endpoint of its own."""
@@ -7,13 +7,19 @@ def __init__(self, client, dict_):
         self.data = dict_
         self.client = client
         self._known_invalid_keys = []
+        self.changes = {}
 
     def refresh(self):
         if self.data.get('resource_url'):
             data = self.client._get(self.data['resource_url'])
             self.data.update(data)
 
-    # TODO: This needs to use the oauth2 client
+    def save(self):
+        if self.data.get('resource_url'):
+            self.client._patch(self.data['resource_url'], self.changes)
+            self.data.update(self.changes)
+            self.changes = {}
+
     def delete(self):
         if self.data.get('resource_url'):
             self.client._delete(self.data['resource_url'])
@@ -23,16 +29,21 @@ def fetch(self, key, default=None):
             return default
 
         try:
-            return self.data[key]
+            # First, look in the cache of pending changes
+            return self.changes[key]
         except KeyError:
-            # Fetch the object if we don't know about this key.
-            # It might exist but not be in our cache.
-            self.refresh()
             try:
+                # Next, look in the potentially incomplete local cache
                 return self.data[key]
-            except:
-                self._known_invalid_keys.append(key)
-                return default
+            except KeyError:
+                # Now refresh the object from its resource_url.
+                # The key might exist but not be in our cache.
+                self.refresh()
+                try:
+                    return self.data[key]
+                except:
+                    self._known_invalid_keys.append(key)
+                    return default
 
 
 # This is terribly cheesy, but makes the client API more consistent
@@ -141,6 +152,22 @@ def _transform(self, item):
         return self.class_(self.client, item)
 
 
+class Wantlist(PaginatedList):
+    def add(self, release, notes=None, notes_public=None, rating=None):
+        release_id = release.id if isinstance(release, Release) else release
+        data = {
+            'release_id': release_id,
+            'notes': notes,
+            'notes_public': notes_public,
+            'rating': rating,
+        }
+        self.client._put(self.url + '/' + str(release_id), omit_none(data))
+
+    def remove(self, release):
+        release_id = release.id if isinstance(release, Release) else release
+        self.client._delete(self.url + '/' + str(release_id))
+
+
 class MixedPaginatedList(BasePaginatedResponse):
     """A paginated list of objects identified by their type parameter."""
     def __init__(self, client, url, key):
@@ -410,18 +437,34 @@ def username(self):
     def name(self):
         return self.fetch('name')
 
+    @name.setter
+    def name(self, value):
+        self.changes['name'] = value
+
     @property
     def profile(self):
         return self.fetch('profile')
 
+    @profile.setter
+    def profile(self, value):
+        self.changes['profile'] = value
+
     @property
     def location(self):
         return self.fetch('location')
 
+    @location.setter
+    def location(self, value):
+        self.changes['location'] = value
+
     @property
     def home_page(self):
         return self.fetch('home_page')
 
+    @home_page.setter
+    def home_page(self, value):
+        self.changes['home_page'] = value
+
     @property
     def releases_contributed(self):
         return self.fetch('releases_contributed')
@@ -454,6 +497,11 @@ def inventory(self):
     def wantlist(self):
         return Wantlist(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
 
+    @property
+    def collection_folders(self):
+        resp = self.client._get(self.fetch('collection_folders_url'))
+        return [CollectionFolder(self.client, d) for d in resp['folders']]
+
     @property
     def rank(self):
         return self.fetch('rank')
@@ -490,6 +538,61 @@ def __repr__(self):
         return '<WantlistItem %r %r>' % (self.id, self.release.title)
 
 
+class CollectionItemInstance(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(CollectionItemInstance, self).__init__(client, dict_)
+
+    @property
+    def id(self):
+        return self.fetch('id')
+
+    @property
+    def rating(self):
+        return self.fetch('rating')
+
+    @property
+    def folder_id(self):
+        # TODO: needs folder_url
+        return self.fetch('folder_id')
+
+    @property
+    def notes(self):
+        # TODO: need resource_url on fields
+        return self.fetch('notes')
+
+    @property
+    def release(self):
+        return Release(self.client, self.fetch('basic_information'))
+
+    def __repr__(self):
+        return '<CollectionItemInstance %r %r>' % (self.id, self.release.title)
+
+
+class CollectionFolder(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(CollectionFolder, self).__init__(client, dict_)
+
+    @property
+    def id(self):
+        return self.fetch('id')
+
+    @property
+    def name(self):
+        return self.fetch('name')
+
+    @property
+    def count(self):
+        return self.fetch('count')
+
+    @property
+    def releases(self):
+        # TODO: Needs releases_url
+        return PaginatedList(self.client, self.fetch('resource_url') + '/releases', 'releases', CollectionItemInstance)
+
+    def __repr__(self):
+        return '<CollectionFolder %r %r>' % (self.id, self.name)
+
+
 class Listing(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)

From 49a06bbdac45d5c1999336230679ee2f410ce29d Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 13:32:04 -0800
Subject: [PATCH 11/52] Add helpers for metaprogrammatically adding fetched
 properties.

---
 discogs_client/helpers.py | 36 ++++++++++++++++++++++++++++++++++++
 discogs_client/models.py  |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/discogs_client/helpers.py b/discogs_client/helpers.py
index d371837..6f5ffd3 100644
--- a/discogs_client/helpers.py
+++ b/discogs_client/helpers.py
@@ -4,11 +4,47 @@ def parse_timestamp(timestamp):
     """Convert an ISO 8601 timestamp into a datetime."""
     return datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S')
 
+
 def update_qs(url, params):
     """A not-very-intelligent function to glom parameters onto a query string."""
     joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
     separator = '&' if '?' in url else '?'
     return url + separator + joined_qs
 
+
 def omit_none(dict_):
     return dict((k, v) for k, v in dict_.iteritems() if v is not None)
+
+
+class Fetched(object):
+    """
+    An attribute that determines its value using the object's fetch() method.
+
+    Shorthand for:
+
+        @property
+        def foo(self):
+            return self.fetch('foo')
+    """
+    def __init__(self, name, settable=False):
+        self.name = name
+        self.settable = settable
+
+    def __get__(self, obj, objtype=None):
+        if obj is None:
+            return self
+        return obj.fetch(self.name)
+
+    def __set__(self, obj, value):
+        if self.settable:
+            pass
+        raise AttributeError("can't set attribute")
+
+
+def fetches(names, settable=False):
+    """Helper that adds a batch of Fetched properties to a class."""
+    def f(cls):
+        for name in names:
+            setattr(cls, name, Fetched(name, settable=settable))
+        return cls
+    return f
diff --git a/discogs_client/models.py b/discogs_client/models.py
index 659b33a..45a1286 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -1,5 +1,5 @@
 from discogs_client.exceptions import HTTPError
-from discogs_client.helpers import parse_timestamp, update_qs, omit_none
+from discogs_client.helpers import parse_timestamp, update_qs, omit_none, fetches
 
 class BaseAPIObject(object):
     """A first-order API object that has a canonical endpoint of its own."""

From 85fa5bab4ea93602a7396a02ba536236dc036ca5 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 14:57:14 -0800
Subject: [PATCH 12/52] Allow certain Fetched properties to be set.

---
 discogs_client/helpers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/discogs_client/helpers.py b/discogs_client/helpers.py
index 6f5ffd3..99f1720 100644
--- a/discogs_client/helpers.py
+++ b/discogs_client/helpers.py
@@ -37,7 +37,8 @@ def __get__(self, obj, objtype=None):
 
     def __set__(self, obj, value):
         if self.settable:
-            pass
+            obj.changes[self.name] = value
+            return
         raise AttributeError("can't set attribute")
 
 

From fd2712c34710b06da5f48d2225eeda0fa8ef8388 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 15:02:24 -0800
Subject: [PATCH 13/52] Replace reundant property declarations with @fetches
 decorator.

---
 discogs_client/models.py | 324 ++++-----------------------------------
 1 file changed, 26 insertions(+), 298 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 45a1286..33e5dfe 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -184,35 +184,12 @@ def _transform(self, item):
         return CLASS_MAP[item['type']](self.client, item)
 
 
+@fetches(['id', 'name', 'real_name', 'profile', 'data_quality', 'name_variations', 'urls'])
 class Artist(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/artists/%d' % dict_['id']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def name(self):
-        return self.fetch('name')
-
-    @property
-    def real_name(self):
-        return self.fetch('realname')
-
-    @property
-    def profile(self):
-        return self.fetch('profile')
-
-    @property
-    def data_quality(self):
-        return self.fetch('data_quality')
-
-    @property
-    def name_variations(self):
-        return self.fetch('namevariations')
-
     @property
     def aliases(self):
         return [Artist(self.client, d) for d in self.fetch('aliases', [])]
@@ -225,10 +202,6 @@ def members(self):
     def groups(self):
         return [Artist(self.client, d) for d in self.fetch('groups', [])]
 
-    @property
-    def urls(self):
-        return self.fetch('urls')
-
     @property
     def releases(self):
         return MixedPaginatedList(self.client, self.fetch('releases_url'), 'releases')
@@ -237,55 +210,19 @@ def __repr__(self):
         return '<Artist %r %r>' % (self.id, self.name)
 
 
+@fetches([
+    'id', 'title', 'year', 'thumb', 'data_quality', 'status', 'genres',
+    'country', 'notes', 'formats',
+])
 class Release(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Release, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/releases/%d' % dict_['id']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def title(self):
-        return self.fetch('title')
-
-    @property
-    def year(self):
-        return self.fetch('year')
-
-    @property
-    def thumb(self):
-        return self.fetch('thumb')
-
-    @property
-    def data_quality(self):
-        return self.fetch('data_quality')
-
-    @property
-    def status(self):
-        return self.fetch('status')
-
     @property
     def videos(self):
         return [Video(self.client, d) for d in self.fetch('videos', [])]
 
-    @property
-    def genres(self):
-        return self.fetch('genres')
-
-    @property
-    def country(self):
-        return self.fetch('country')
-
-    @property
-    def notes(self):
-        return self.fetch('notes')
-
-    @property
-    def formats(self):
-        return self.fetch('formats')
-
     @property
     def tracklist(self):
         return [Track(self.client, d) for d in self.fetch('tracklist', [])]
@@ -318,35 +255,16 @@ def __repr__(self):
         return '<Release %r %r>' % (self.id, self.title)
 
 
+@fetches(['id', 'title', 'data_quality', 'styles', 'genres', 'images'])
 class Master(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Master, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/masters/%d' % dict_['id']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def title(self):
-        return self.fetch('title')
-
-    @property
-    def data_quality(self):
-        return self.fetch('data_quality')
-
     @property
     def versions(self):
         return PaginatedList(self.client, self.fetch('versions_url'), 'versions', Release)
 
-    @property
-    def styles(self):
-        return self.fetch('styles')
-
-    @property
-    def genres(self):
-        return self.fetch('genres')
-
     @property
     def videos(self):
         return [Video(self.client, d) for d in self.fetch('videos', [])]
@@ -359,47 +277,18 @@ def main_release(self):
     def tracklist(self):
         return [Track(self.client, d) for d in self.fetch('tracklist', [])]
 
-    @property
-    def images(self):
-        return self.fetch('images')
-
     def __repr__(self):
         return '<Master %r %r>' % (self.id, self.title)
 
 
+@fetches([
+    'id', 'name', 'profile', 'urls', 'images', 'contact_info', 'data_quality',
+])
 class Label(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Label, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/labels/%d' % dict_['id']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def name(self):
-        return self.fetch('name')
-
-    @property
-    def profile(self):
-        return self.fetch('profile')
-
-    @property
-    def urls(self):
-        return self.fetch('urls')
-
-    @property
-    def images(self):
-        return self.fetch('images')
-
-    @property
-    def contact_info(self):
-        return self.fetch('contact_info')
-
-    @property
-    def data_quality(self):
-        return self.fetch('data_quality')
-
     @property
     def releases(self):
         return PaginatedList(self.client, self.fetch('releases_url'), 'releases', Release)
@@ -420,75 +309,20 @@ def __repr__(self):
         return '<Label %r %r>' % (self.id, self.name)
 
 
+@fetches([
+    'id', 'username', 'releases_contributed', 'num_collection', 'num_wantlist',
+    'num_lists', 'rank', 'rating_avg'
+])
+@fetches(['name', 'profile', 'location', 'home_page'], settable=True)
 class User(BaseAPIObject):
     def __init__(self, client, dict_):
         super(User, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/users/%s' % dict_['username']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def username(self):
-        return self.fetch('username')
-
-    @property
-    def name(self):
-        return self.fetch('name')
-
-    @name.setter
-    def name(self, value):
-        self.changes['name'] = value
-
-    @property
-    def profile(self):
-        return self.fetch('profile')
-
-    @profile.setter
-    def profile(self, value):
-        self.changes['profile'] = value
-
-    @property
-    def location(self):
-        return self.fetch('location')
-
-    @location.setter
-    def location(self, value):
-        self.changes['location'] = value
-
-    @property
-    def home_page(self):
-        return self.fetch('home_page')
-
-    @home_page.setter
-    def home_page(self, value):
-        self.changes['home_page'] = value
-
-    @property
-    def releases_contributed(self):
-        return self.fetch('releases_contributed')
-
     @property
     def registered(self):
         return parse_timestamp(self.fetch('registered'))
 
-    @property
-    def rating_average(self):
-        return self.fetch('rating_avg')
-
-    @property
-    def num_collection(self):
-        return self.fetch('num_collection')
-
-    @property
-    def num_wantlist(self):
-        return self.fetch('num_wantlist')
-
-    @property
-    def num_lists(self):
-        return self.fetch('num_lists')
-
     @property
     def inventory(self):
         return PaginatedList(self.client, self.fetch('inventory_url'), 'listings', Listing)
@@ -502,34 +336,15 @@ def collection_folders(self):
         resp = self.client._get(self.fetch('collection_folders_url'))
         return [CollectionFolder(self.client, d) for d in resp['folders']]
 
-    @property
-    def rank(self):
-        return self.fetch('rank')
-
     def __repr__(self):
         return '<User %r %r>' % (self.id, self.username)
 
 
+@fetches(['id', 'rating', 'notes', 'notes_public'])
 class WantlistItem(BaseAPIObject):
     def __init__(self, client, dict_):
         super(WantlistItem, self).__init__(client, dict_)
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def rating(self):
-        return self.fetch('rating')
-
-    @property
-    def notes(self):
-        return self.fetch('notes')
-
-    @property
-    def notes_public(self):
-        return self.fetch('notes_public')
-
     @property
     def release(self):
         return Release(self.client, self.fetch('basic_information'))
@@ -538,28 +353,13 @@ def __repr__(self):
         return '<WantlistItem %r %r>' % (self.id, self.release.title)
 
 
+# TODO: folder_id should be a Folder object; needs folder_url
+# TODO: notes should be first-order (somehow); needs resource_url
+@fetches(['id', 'rating', 'folder_id', 'notes'])
 class CollectionItemInstance(BaseAPIObject):
     def __init__(self, client, dict_):
         super(CollectionItemInstance, self).__init__(client, dict_)
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def rating(self):
-        return self.fetch('rating')
-
-    @property
-    def folder_id(self):
-        # TODO: needs folder_url
-        return self.fetch('folder_id')
-
-    @property
-    def notes(self):
-        # TODO: need resource_url on fields
-        return self.fetch('notes')
-
     @property
     def release(self):
         return Release(self.client, self.fetch('basic_information'))
@@ -568,22 +368,11 @@ def __repr__(self):
         return '<CollectionItemInstance %r %r>' % (self.id, self.release.title)
 
 
+@fetches(['id', 'name', 'count'])
 class CollectionFolder(BaseAPIObject):
     def __init__(self, client, dict_):
         super(CollectionFolder, self).__init__(client, dict_)
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def name(self):
-        return self.fetch('name')
-
-    @property
-    def count(self):
-        return self.fetch('count')
-
     @property
     def releases(self):
         # TODO: Needs releases_url
@@ -593,47 +382,19 @@ def __repr__(self):
         return '<CollectionFolder %r %r>' % (self.id, self.name)
 
 
+@fetches([
+    'id', 'status', 'allow_offers', 'condition', 'sleeve_condition',
+    'ships_from', 'comments', 'audio',
+])
 class Listing(BaseAPIObject):
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/marketplace/listings/%d' % dict_['id']
 
-    @property
-    def id(self):
-        return self.fetch('id')
-
-    @property
-    def status(self):
-        return self.fetch('status')
-
     @property
     def price(self):
         return Price(self.client, self.fetch('price', {}))
 
-    @property
-    def allow_offers(self):
-        return self.fetch('allow_offers')
-
-    @property
-    def condition(self):
-        return self.fetch('condition')
-
-    @property
-    def sleeve_condition(self):
-        return self.fetch('sleeve_condition')
-
-    @property
-    def ships_from(self):
-        return self.fetch('ships_from')
-
-    @property
-    def comments(self):
-        return self.fetch('comments')
-
-    @property
-    def audio(self):
-        return self.fetch('audio')
-
     @property
     def posted(self):
         return parse_timestamp(self.fetch('posted'))
@@ -650,19 +411,8 @@ def __repr__(self):
         return '<Listing %r %r>' % (self.id, self.release.data['description'])
 
 
+@fetches(['duration', 'position', 'title'])
 class Track(SecondaryAPIObject):
-    @property
-    def duration(self):
-        return self.fetch('duration')
-
-    @property
-    def position(self):
-        return self.fetch('position')
-
-    @property
-    def title(self):
-        return self.fetch('title')
-
     @property
     def artists(self):
         return [Artist(self.client, d) for d in self.fetch('artists', [])]
@@ -675,41 +425,19 @@ def __repr__(self):
         return '<Track %r %r>' % (self.position, self.title)
 
 
+@fetches(['currency', 'value'])
 class Price(SecondaryAPIObject):
-    @property
-    def currency(self):
-        return self.fetch('currency')
-
-    @property
-    def value(self):
-        return self.fetch('value')
-
     def __repr__(self):
         return '<Price %r %r>' % (self.value, self.currency)
 
 
+@fetches(['duration', 'embed', 'title', 'description'])
 class Video(SecondaryAPIObject):
-    @property
-    def duration(self):
-        return self.fetch('duration')
-
-    @property
-    def embed(self):
-        return self.fetch('embed')
-
-    @property
-    def title(self):
-        return self.fetch('title')
-
     # The API returns this as 'uri' :\
     @property
     def url(self):
         return self.fetch('uri')
 
-    @property
-    def description(self):
-        return self.fetch('description')
-
     def __repr__(self):
         return '<Video %r>' % (self.title)
 

From 4773d8244a6038d04e9a38ce9fe6d39943114fbf Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 15:03:11 -0800
Subject: [PATCH 14/52] Use POST instead of PATCH for now.

---
 discogs_client/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 33e5dfe..f267ebc 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -16,7 +16,8 @@ def refresh(self):
 
     def save(self):
         if self.data.get('resource_url'):
-            self.client._patch(self.data['resource_url'], self.changes)
+            # TODO: This should be PATCH
+            self.client._post(self.data['resource_url'], self.changes)
             self.data.update(self.changes)
             self.changes = {}
 

From cf343f900d1b4186e219847afa754fe2cf20a634 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 15:26:21 -0800
Subject: [PATCH 15/52] Refresh the object after saving.

---
 discogs_client/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index f267ebc..6ffca8f 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -13,13 +13,15 @@ def refresh(self):
         if self.data.get('resource_url'):
             data = self.client._get(self.data['resource_url'])
             self.data.update(data)
+            self.changes = {}
 
     def save(self):
         if self.data.get('resource_url'):
             # TODO: This should be PATCH
             self.client._post(self.data['resource_url'], self.changes)
-            self.data.update(self.changes)
-            self.changes = {}
+
+            # Refresh the object, in case there were side-effects
+            self.refresh()
 
     def delete(self):
         if self.data.get('resource_url'):

From e8e6b512ce599cf28c48a2bb6d33709d934c5b65 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 15:27:41 -0800
Subject: [PATCH 16/52] Remove unneeded default when constructing Listing
 price.

All Listings have prices, and if there was one that didn't,
an empty dict wouldn't be a valid Price anyway.
---
 discogs_client/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 6ffca8f..6c07164 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -396,7 +396,7 @@ def __init__(self, client, dict_):
 
     @property
     def price(self):
-        return Price(self.client, self.fetch('price', {}))
+        return Price(self.client, self.fetch('price'))
 
     @property
     def posted(self):

From 5693b727a17384b263b59fa2bdb0256bf0e429ef Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 16:34:25 -0800
Subject: [PATCH 17/52] Add order management.

---
 discogs_client/client.py |  3 ++
 discogs_client/models.py | 80 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index 1aee3ca..bde6004 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -152,6 +152,9 @@ def user(self, username):
     def listing(self, id):
         return models.Listing(self, {'id': id})
 
+    def order(self, id):
+        return models.Order(self, {'id': id})
+
     def fee_for(self, price, currency='USD'):
         resp = self._get(self._base_url + '/marketplace/fee/%f/%s' % (float(price), currency))
         return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
diff --git a/discogs_client/models.py b/discogs_client/models.py
index 6c07164..baf5fc4 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -171,6 +171,17 @@ def remove(self, release):
         self.client._delete(self.url + '/' + str(release_id))
 
 
+class OrderMessagesList(PaginatedList):
+    def add(self, message=None, status=None, email_buyer=True, email_seller=False):
+        data = {
+            'message': message,
+            'status': status,
+            'email_buyer': email_buyer,
+            'email_seller': email_seller,
+        }
+        self.client._post(self.url, omit_none(data))
+
+
 class MixedPaginatedList(BasePaginatedResponse):
     """A paginated list of objects identified by their type parameter."""
     def __init__(self, client, url, key):
@@ -330,6 +341,10 @@ def registered(self):
     def inventory(self):
         return PaginatedList(self.client, self.fetch('inventory_url'), 'listings', Listing)
 
+    @property
+    def orders(self):
+        return PaginatedList(self.client, self.client._base_url + '/marketplace/orders', 'orders', Order)
+
     @property
     def wantlist(self):
         return Wantlist(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
@@ -414,6 +429,71 @@ def __repr__(self):
         return '<Listing %r %r>' % (self.id, self.release.data['description'])
 
 
+@fetches([
+    'id', 'next_status', 'shipping_address', 'additional_instructions'
+])
+@fetches(['status'], settable=True)
+class Order(BaseAPIObject):
+    def __init__(self, client, dict_):
+        super(Order, self).__init__(client, dict_)
+        self.data['resource_url'] = client._base_url + '/marketplace/orders/%s' % dict_['id']
+
+    @property
+    def created(self):
+        return parse_timestamp(self.fetch('created'))
+
+    @property
+    def last_activity(self):
+        return parse_timestamp(self.fetch('last_activity'))
+
+    @property
+    def fee(self):
+        return Price(self.client, self.fetch('fee'))
+
+    @property
+    def shipping(self):
+        return Price(self.client, self.fetch('shipping'))
+
+    # Setting shipping is a little weird -- you can't change the
+    # currency, and you use the 'shipping' key instead of 'value'
+    @shipping.setter
+    def shipping(self, value):
+        self.changes['shipping'] = value
+
+    @property
+    def buyer(self):
+        return User(self.client, self.fetch('buyer'))
+
+    @property
+    def seller(self):
+        return User(self.client, self.fetch('seller'))
+
+    @property
+    def messages(self):
+        return OrderMessagesList(self.client, self.fetch('messages_url'), 'messages', OrderMessage)
+
+    def __repr__(self):
+        return '<Order %r>' % self.id
+
+
+@fetches(['subject', 'message'])
+class OrderMessage(SecondaryAPIObject):
+    @property
+    def to(self):
+        return User(self.client, self.fetch('to'))
+
+    @property
+    def order(self):
+        return Order(self.client, self.fetch('order'))
+
+    @property
+    def timestamp(self):
+        return parse_timestamp(self.fetch('timestamp'))
+
+    def __repr__(self):
+        return '<OrderMessage to:%r>' % self.to.username
+
+
 @fetches(['duration', 'position', 'title'])
 class Track(SecondaryAPIObject):
     @property

From 7d5f676a46d812a7280d028a5b64de3ab18bb3c7 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 29 Nov 2011 16:58:46 -0800
Subject: [PATCH 18/52] Stylistic improvements to cache lookup logic.

---
 discogs_client/models.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index baf5fc4..a699fc7 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -35,18 +35,23 @@ def fetch(self, key, default=None):
             # First, look in the cache of pending changes
             return self.changes[key]
         except KeyError:
-            try:
-                # Next, look in the potentially incomplete local cache
-                return self.data[key]
-            except KeyError:
-                # Now refresh the object from its resource_url.
-                # The key might exist but not be in our cache.
-                self.refresh()
-                try:
-                    return self.data[key]
-                except:
-                    self._known_invalid_keys.append(key)
-                    return default
+            pass
+
+        try:
+            # Next, look in the potentially incomplete local cache
+            return self.data[key]
+        except KeyError:
+            pass
+
+        # Now refresh the object from its resource_url.
+        # The key might exist but not be in our cache.
+        self.refresh()
+
+        try:
+            return self.data[key]
+        except:
+            self._known_invalid_keys.append(key)
+            return default
 
 
 # This is terribly cheesy, but makes the client API more consistent

From 5aa43493e53941092fb913d9defcd0397c003d50 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Wed, 30 Nov 2011 11:02:34 -0800
Subject: [PATCH 19/52] Enable modification of WantlistItem properties.

---
 discogs_client/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index a699fc7..3b522b7 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -363,7 +363,8 @@ def __repr__(self):
         return '<User %r %r>' % (self.id, self.username)
 
 
-@fetches(['id', 'rating', 'notes', 'notes_public'])
+@fetches(['id'])
+@fetches(['rating', 'notes', 'notes_public'], settable=True)
 class WantlistItem(BaseAPIObject):
     def __init__(self, client, dict_):
         super(WantlistItem, self).__init__(client, dict_)

From b74490bd185674b88e9c84ee41d5a389841ddbe3 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 15 Dec 2011 15:53:12 -0800
Subject: [PATCH 20/52] Replace `fetches` decorator with metaclass.

---
 discogs_client/helpers.py |  35 ---
 discogs_client/models.py  | 461 +++++++++++++++++++++++---------------
 2 files changed, 284 insertions(+), 212 deletions(-)

diff --git a/discogs_client/helpers.py b/discogs_client/helpers.py
index 99f1720..698fc83 100644
--- a/discogs_client/helpers.py
+++ b/discogs_client/helpers.py
@@ -14,38 +14,3 @@ def update_qs(url, params):
 
 def omit_none(dict_):
     return dict((k, v) for k, v in dict_.iteritems() if v is not None)
-
-
-class Fetched(object):
-    """
-    An attribute that determines its value using the object's fetch() method.
-
-    Shorthand for:
-
-        @property
-        def foo(self):
-            return self.fetch('foo')
-    """
-    def __init__(self, name, settable=False):
-        self.name = name
-        self.settable = settable
-
-    def __get__(self, obj, objtype=None):
-        if obj is None:
-            return self
-        return obj.fetch(self.name)
-
-    def __set__(self, obj, value):
-        if self.settable:
-            obj.changes[self.name] = value
-            return
-        raise AttributeError("can't set attribute")
-
-
-def fetches(names, settable=False):
-    """Helper that adds a batch of Fetched properties to a class."""
-    def f(cls):
-        for name in names:
-            setattr(cls, name, Fetched(name, settable=settable))
-        return cls
-    return f
diff --git a/discogs_client/models.py b/discogs_client/models.py
index 3b522b7..4eb3d00 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -1,7 +1,152 @@
 from discogs_client.exceptions import HTTPError
-from discogs_client.helpers import parse_timestamp, update_qs, omit_none, fetches
+from discogs_client.helpers import parse_timestamp, update_qs, omit_none
 
-class BaseAPIObject(object):
+
+class SimpleDescriptor(object):
+    """
+    An attribute that determines its value using the object's fetch() method.
+
+    If transform is a callable, the value will be passed through transform when
+    read. Useful for strings that should be ints, parsing timestamps, etc.
+
+    Shorthand for:
+
+        @property
+        def foo(self):
+            return self.fetch('foo')
+    """
+    def __init__(self, name, settable=False, transform=None):
+        self.name = name
+        self.settable = settable
+        self.transform = transform
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        value = instance.fetch(self.name)
+        if self.transform:
+            value = self.transform(value)
+        return value
+
+    def __set__(self, instance, value):
+        if self.settable:
+            instance.changes[self.name] = value
+            return
+        raise AttributeError("can't set attribute")
+
+
+class ObjectDescriptor(object):
+    """
+    An attribute that determines its value using the object's fetch() method,
+    and passes the resulting value through an APIObject.
+
+    If optional = True, the value will be None (rather than an APIObject
+    instance) if the key is missing from the response.
+
+    If as_id = True, the value is treated as an ID for the new APIObject rather
+    than a partial dict of the APIObject.
+
+    Shorthand for:
+
+        @property
+        def baz(self):
+            return BazClass(self.client, self.fetch('baz'))
+    """
+    def __init__(self, name, class_name, optional=False, as_id=False):
+        self.name = name
+        self.class_name = class_name
+        self.optional = optional
+        self.as_id = as_id
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        wrapper_class = CLASS_MAP[self.class_name.lower()]
+        response_dict = instance.fetch(self.name)
+        if self.optional and not response_dict:
+            return None
+        if self.as_id:
+            # Response_dict wasn't really a dict. Make it so.
+            response_dict = {'id': response_dict}
+        return wrapper_class(instance.client, response_dict)
+
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+
+class ListDescriptor(object):
+    """
+    An attribute that determines its value using the object's fetch() method,
+    and passes each item in the resulting list through an APIObject.
+
+    Shorthand for:
+
+        @property
+        def bar(self):
+            return [BarClass(self.client, d) for d in self.fetch('bar', [])]
+    """
+    def __init__(self, name, class_name):
+        self.name = name
+        self.class_name = class_name
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        wrapper_class = CLASS_MAP[self.class_name.lower()]
+        return [wrapper_class(instance.client, d) for d in instance.fetch(self.name, [])]
+
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+
+class Field(object):
+    """
+    A placeholder for a descriptor. Is transformed into a descriptor by the
+    APIObjectMeta metaclass when the APIObject classes are created.
+    """
+    _descriptor_class = None
+
+    def __init__(self, *args, **kwargs):
+        self.key = None
+        if 'key' in kwargs:
+            self.key = kwargs['key']
+            del kwargs['key']
+
+        self.args = args
+        self.kwargs = kwargs
+
+    def to_descriptor(self, attr_name):
+        return self._descriptor_class(self.key or attr_name, *self.args, **self.kwargs)
+
+
+class SimpleField(Field):
+    """A field that just returns the value of a given JSON key."""
+    _descriptor_class = SimpleDescriptor
+
+
+class ListField(Field):
+    """A field that returns a list of APIObjects."""
+    _descriptor_class = ListDescriptor
+
+
+class ObjectField(Field):
+    """A field that returns a single APIObject."""
+    _descriptor_class = ObjectDescriptor
+
+
+class APIObjectMeta(type):
+    def __new__(cls, name, bases, dict_):
+        for k, v in dict_.iteritems():
+            if isinstance(v, Field):
+                dict_[k] = v.to_descriptor(k)
+        return super(APIObjectMeta, cls).__new__(cls, name, bases, dict_)
+
+
+class APIObject(object):
+    __metaclass__ = APIObjectMeta
+
+
+class PrimaryAPIObject(APIObject):
     """A first-order API object that has a canonical endpoint of its own."""
     def __init__(self, client, dict_):
         self.data = dict_
@@ -55,7 +200,7 @@ def fetch(self, key, default=None):
 
 
 # This is terribly cheesy, but makes the client API more consistent
-class SecondaryAPIObject(object):
+class SecondaryAPIObject(APIObject):
     """
     An object that wraps parts of a response and doesn't have its own
     endpoint.
@@ -203,24 +348,22 @@ def _transform(self, item):
         return CLASS_MAP[item['type']](self.client, item)
 
 
-@fetches(['id', 'name', 'real_name', 'profile', 'data_quality', 'name_variations', 'urls'])
-class Artist(BaseAPIObject):
+class Artist(PrimaryAPIObject):
+    id = SimpleField()
+    name = SimpleField()
+    real_name = SimpleField()
+    profile = SimpleField()
+    data_quality = SimpleField()
+    name_variations = SimpleField()
+    urls = SimpleField()
+    aliases = ListField('Artist')
+    members = ListField('Artist')
+    groups = ListField('Artist')
+
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/artists/%d' % dict_['id']
 
-    @property
-    def aliases(self):
-        return [Artist(self.client, d) for d in self.fetch('aliases', [])]
-
-    @property
-    def members(self):
-        return [Artist(self.client, d) for d in self.fetch('members', [])]
-
-    @property
-    def groups(self):
-        return [Artist(self.client, d) for d in self.fetch('groups', [])]
-
     @property
     def releases(self):
         return MixedPaginatedList(self.client, self.fetch('releases_url'), 'releases')
@@ -229,39 +372,28 @@ def __repr__(self):
         return '<Artist %r %r>' % (self.id, self.name)
 
 
-@fetches([
-    'id', 'title', 'year', 'thumb', 'data_quality', 'status', 'genres',
-    'country', 'notes', 'formats',
-])
-class Release(BaseAPIObject):
+class Release(PrimaryAPIObject):
+    id = SimpleField()
+    title = SimpleField()
+    year = SimpleField()
+    thumb = SimpleField()
+    data_quality = SimpleField()
+    status = SimpleField()
+    genres = SimpleField()
+    country = SimpleField()
+    notes = SimpleField()
+    formats = SimpleField()
+    videos = ListField('Video')
+    tracklist = ListField('Track')
+    artists = ListField('Artist')
+    credits = ListField('Artist', key='extraartists')
+    labels = ListField('Label')
+    companies = ListField('Label')
+
     def __init__(self, client, dict_):
         super(Release, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/releases/%d' % dict_['id']
 
-    @property
-    def videos(self):
-        return [Video(self.client, d) for d in self.fetch('videos', [])]
-
-    @property
-    def tracklist(self):
-        return [Track(self.client, d) for d in self.fetch('tracklist', [])]
-
-    @property
-    def artists(self):
-        return [Artist(self.client, d) for d in self.fetch('artists', [])]
-
-    @property
-    def credits(self):
-        return [Artist(self.client, d) for d in self.fetch('extraartists', [])]
-
-    @property
-    def labels(self):
-        return [Label(self.client, d) for d in self.fetch('labels', [])]
-
-    @property
-    def companies(self):
-        return [Label(self.client, d) for d in self.fetch('companies', [])]
-
     @property
     def master(self):
         master_id = self.fetch('master_id')
@@ -274,8 +406,17 @@ def __repr__(self):
         return '<Release %r %r>' % (self.id, self.title)
 
 
-@fetches(['id', 'title', 'data_quality', 'styles', 'genres', 'images'])
-class Master(BaseAPIObject):
+class Master(PrimaryAPIObject):
+    id = SimpleField()
+    title = SimpleField()
+    data_quality = SimpleField()
+    styles = SimpleField()
+    genres = SimpleField()
+    images = SimpleField()
+    videos = ListField('Video')
+    tracklist = ListField('Track')
+    main_release = ObjectField('Release', as_id=True)
+
     def __init__(self, client, dict_):
         super(Master, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/masters/%d' % dict_['id']
@@ -284,26 +425,21 @@ def __init__(self, client, dict_):
     def versions(self):
         return PaginatedList(self.client, self.fetch('versions_url'), 'versions', Release)
 
-    @property
-    def videos(self):
-        return [Video(self.client, d) for d in self.fetch('videos', [])]
-
-    @property
-    def main_release(self):
-        return Release(self.client, {'id': self.fetch('main_release')})
-
-    @property
-    def tracklist(self):
-        return [Track(self.client, d) for d in self.fetch('tracklist', [])]
-
     def __repr__(self):
         return '<Master %r %r>' % (self.id, self.title)
 
 
-@fetches([
-    'id', 'name', 'profile', 'urls', 'images', 'contact_info', 'data_quality',
-])
-class Label(BaseAPIObject):
+class Label(PrimaryAPIObject):
+    id = SimpleField()
+    name = SimpleField()
+    profile = SimpleField()
+    urls = SimpleField()
+    images = SimpleField()
+    contact_info = SimpleField()
+    data_quality = SimpleField()
+    sublabels = ListField('Label')
+    parent_label = ObjectField('Label', as_id=True, optional=True)
+
     def __init__(self, client, dict_):
         super(Label, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/labels/%d' % dict_['id']
@@ -312,36 +448,29 @@ def __init__(self, client, dict_):
     def releases(self):
         return PaginatedList(self.client, self.fetch('releases_url'), 'releases', Release)
 
-    @property
-    def sublabels(self):
-        return [Label(self.client, d) for d in self.fetch('sublabels', [])]
-
-    @property
-    def parent_label(self):
-        parent_label_dict = self.fetch('parent_label')
-        if parent_label_dict:
-            return Label(self.client, parent_label_dict)
-        else:
-            return None
-
     def __repr__(self):
         return '<Label %r %r>' % (self.id, self.name)
 
 
-@fetches([
-    'id', 'username', 'releases_contributed', 'num_collection', 'num_wantlist',
-    'num_lists', 'rank', 'rating_avg'
-])
-@fetches(['name', 'profile', 'location', 'home_page'], settable=True)
-class User(BaseAPIObject):
+class User(PrimaryAPIObject):
+    id = SimpleField()
+    username = SimpleField()
+    releases_contributed = SimpleField()
+    num_collection = SimpleField()
+    num_wantlist = SimpleField()
+    num_lists = SimpleField()
+    rank = SimpleField()
+    rating_avg = SimpleField()
+    name = SimpleField(settable=True)
+    profile = SimpleField(settable=True)
+    location = SimpleField(settable=True)
+    home_page = SimpleField(settable=True)
+    registered = SimpleField(transform=parse_timestamp)
+
     def __init__(self, client, dict_):
         super(User, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/users/%s' % dict_['username']
 
-    @property
-    def registered(self):
-        return parse_timestamp(self.fetch('registered'))
-
     @property
     def inventory(self):
         return PaginatedList(self.client, self.fetch('inventory_url'), 'listings', Listing)
@@ -363,37 +492,40 @@ def __repr__(self):
         return '<User %r %r>' % (self.id, self.username)
 
 
-@fetches(['id'])
-@fetches(['rating', 'notes', 'notes_public'], settable=True)
-class WantlistItem(BaseAPIObject):
+class WantlistItem(PrimaryAPIObject):
+    id = SimpleField()
+    rating = SimpleField(settable=True)
+    notes = SimpleField(settable=True)
+    notes_public = SimpleField(settable=True)
+    release = ObjectField('Release', key='basic_information')
+
     def __init__(self, client, dict_):
         super(WantlistItem, self).__init__(client, dict_)
 
-    @property
-    def release(self):
-        return Release(self.client, self.fetch('basic_information'))
-
     def __repr__(self):
         return '<WantlistItem %r %r>' % (self.id, self.release.title)
 
 
 # TODO: folder_id should be a Folder object; needs folder_url
 # TODO: notes should be first-order (somehow); needs resource_url
-@fetches(['id', 'rating', 'folder_id', 'notes'])
-class CollectionItemInstance(BaseAPIObject):
+class CollectionItemInstance(PrimaryAPIObject):
+    id = SimpleField()
+    rating = SimpleField()
+    folder_id = SimpleField()
+    notes = SimpleField()
+    release = ObjectField('Release', key='basic_information')
+
     def __init__(self, client, dict_):
         super(CollectionItemInstance, self).__init__(client, dict_)
 
-    @property
-    def release(self):
-        return Release(self.client, self.fetch('basic_information'))
-
     def __repr__(self):
         return '<CollectionItemInstance %r %r>' % (self.id, self.release.title)
 
 
-@fetches(['id', 'name', 'count'])
-class CollectionFolder(BaseAPIObject):
+class CollectionFolder(PrimaryAPIObject):
+    id = SimpleField()
+    name = SimpleField()
+    count = SimpleField()
     def __init__(self, client, dict_):
         super(CollectionFolder, self).__init__(client, dict_)
 
@@ -406,74 +538,54 @@ def __repr__(self):
         return '<CollectionFolder %r %r>' % (self.id, self.name)
 
 
-@fetches([
-    'id', 'status', 'allow_offers', 'condition', 'sleeve_condition',
-    'ships_from', 'comments', 'audio',
-])
-class Listing(BaseAPIObject):
+class Listing(PrimaryAPIObject):
+    id = SimpleField()
+    status = SimpleField()
+    allow_offers = SimpleField()
+    condition = SimpleField()
+    sleeve_condition = SimpleField()
+    ships_from = SimpleField()
+    comments = SimpleField()
+    audio = SimpleField()
+    price = ObjectField('Price')
+    release = ObjectField('Release')
+    seller = ObjectField('User')
+    posted = SimpleField(transform=parse_timestamp)
+
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/marketplace/listings/%d' % dict_['id']
 
-    @property
-    def price(self):
-        return Price(self.client, self.fetch('price'))
-
-    @property
-    def posted(self):
-        return parse_timestamp(self.fetch('posted'))
-
-    @property
-    def release(self):
-        return Release(self.client, self.fetch('release'))
-
-    @property
-    def seller(self):
-        return User(self.client, self.fetch('seller'))
-
     def __repr__(self):
         return '<Listing %r %r>' % (self.id, self.release.data['description'])
 
 
-@fetches([
-    'id', 'next_status', 'shipping_address', 'additional_instructions'
-])
-@fetches(['status'], settable=True)
-class Order(BaseAPIObject):
+class Order(PrimaryAPIObject):
+    id = SimpleField()
+    next_status = SimpleField()
+    shipping_address = SimpleField()
+    additional_instructions = SimpleField()
+    status = SimpleField(settable=True)
+    fee = ObjectField('Price')
+    buyer = ObjectField('User')
+    seller = ObjectField('User')
+    created = SimpleField(transform=parse_timestamp)
+    last_activity = SimpleField(transform=parse_timestamp)
+
     def __init__(self, client, dict_):
         super(Order, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/marketplace/orders/%s' % dict_['id']
 
-    @property
-    def created(self):
-        return parse_timestamp(self.fetch('created'))
-
-    @property
-    def last_activity(self):
-        return parse_timestamp(self.fetch('last_activity'))
-
-    @property
-    def fee(self):
-        return Price(self.client, self.fetch('fee'))
-
+    # Setting shipping is a little weird -- you can't change the
+    # currency, and you use the 'shipping' key instead of 'value'
     @property
     def shipping(self):
         return Price(self.client, self.fetch('shipping'))
 
-    # Setting shipping is a little weird -- you can't change the
-    # currency, and you use the 'shipping' key instead of 'value'
     @shipping.setter
     def shipping(self, value):
         self.changes['shipping'] = value
 
-    @property
-    def buyer(self):
-        return User(self.client, self.fetch('buyer'))
-
-    @property
-    def seller(self):
-        return User(self.client, self.fetch('seller'))
-
     @property
     def messages(self):
         return OrderMessagesList(self.client, self.fetch('messages_url'), 'messages', OrderMessage)
@@ -482,59 +594,54 @@ def __repr__(self):
         return '<Order %r>' % self.id
 
 
-@fetches(['subject', 'message'])
 class OrderMessage(SecondaryAPIObject):
-    @property
-    def to(self):
-        return User(self.client, self.fetch('to'))
-
-    @property
-    def order(self):
-        return Order(self.client, self.fetch('order'))
-
-    @property
-    def timestamp(self):
-        return parse_timestamp(self.fetch('timestamp'))
+    subject = SimpleField()
+    message = SimpleField()
+    to = ObjectField('User')
+    order = ObjectField('Order')
+    timestamp = SimpleField(transform=parse_timestamp)
 
     def __repr__(self):
         return '<OrderMessage to:%r>' % self.to.username
 
 
-@fetches(['duration', 'position', 'title'])
 class Track(SecondaryAPIObject):
-    @property
-    def artists(self):
-        return [Artist(self.client, d) for d in self.fetch('artists', [])]
-
-    @property
-    def credits(self):
-        return [Artist(self.client, d) for d in self.fetch('extraartists', [])]
+    duration = SimpleField()
+    position = SimpleField()
+    title = SimpleField()
+    artists = ListField('Artist')
+    credits = ListField('Artist', key='extraartists')
 
     def __repr__(self):
         return '<Track %r %r>' % (self.position, self.title)
 
 
-@fetches(['currency', 'value'])
 class Price(SecondaryAPIObject):
+    currency = SimpleField()
+    value = SimpleField()
+
     def __repr__(self):
         return '<Price %r %r>' % (self.value, self.currency)
 
 
-@fetches(['duration', 'embed', 'title', 'description'])
 class Video(SecondaryAPIObject):
-    # The API returns this as 'uri' :\
-    @property
-    def url(self):
-        return self.fetch('uri')
+    duration = SimpleField()
+    embed = SimpleField()
+    title = SimpleField()
+    description = SimpleField()
+    url = SimpleField('uri')
 
     def __repr__(self):
         return '<Video %r>' % (self.title)
 
-
-# Only things that can show up in a MixedPaginatedList need to go here
 CLASS_MAP = {
     'artist': Artist,
     'release': Release,
     'master': Master,
     'label': Label,
+    'price': Price,
+    'video': Video,
+    'track': Track,
+    'user': User,
+    'order': Order,
 }

From 2b532fef2553b1d14489e3611c67cd7b86dc360a Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 15 Dec 2011 16:44:23 -0800
Subject: [PATCH 21/52] Cleanup and renaming.

---
 discogs_client/models.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 4eb3d00..c787854 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -2,7 +2,7 @@
 from discogs_client.helpers import parse_timestamp, update_qs, omit_none
 
 
-class SimpleDescriptor(object):
+class SimpleFieldDescriptor(object):
     """
     An attribute that determines its value using the object's fetch() method.
 
@@ -15,9 +15,9 @@ class SimpleDescriptor(object):
         def foo(self):
             return self.fetch('foo')
     """
-    def __init__(self, name, settable=False, transform=None):
+    def __init__(self, name, writable=False, transform=None):
         self.name = name
-        self.settable = settable
+        self.writable = writable
         self.transform = transform
 
     def __get__(self, instance, owner):
@@ -29,13 +29,13 @@ def __get__(self, instance, owner):
         return value
 
     def __set__(self, instance, value):
-        if self.settable:
+        if self.writable:
             instance.changes[self.name] = value
             return
         raise AttributeError("can't set attribute")
 
 
-class ObjectDescriptor(object):
+class ObjectFieldDescriptor(object):
     """
     An attribute that determines its value using the object's fetch() method,
     and passes the resulting value through an APIObject.
@@ -74,7 +74,7 @@ def __set__(self, instance, value):
         raise AttributeError("can't set attribute")
 
 
-class ListDescriptor(object):
+class ListFieldDescriptor(object):
     """
     An attribute that determines its value using the object's fetch() method,
     and passes each item in the resulting list through an APIObject.
@@ -121,17 +121,17 @@ def to_descriptor(self, attr_name):
 
 class SimpleField(Field):
     """A field that just returns the value of a given JSON key."""
-    _descriptor_class = SimpleDescriptor
+    _descriptor_class = SimpleFieldDescriptor
 
 
 class ListField(Field):
     """A field that returns a list of APIObjects."""
-    _descriptor_class = ListDescriptor
+    _descriptor_class = ListFieldDescriptor
 
 
 class ObjectField(Field):
     """A field that returns a single APIObject."""
-    _descriptor_class = ObjectDescriptor
+    _descriptor_class = ObjectFieldDescriptor
 
 
 class APIObjectMeta(type):
@@ -494,9 +494,9 @@ def __repr__(self):
 
 class WantlistItem(PrimaryAPIObject):
     id = SimpleField()
-    rating = SimpleField(settable=True)
-    notes = SimpleField(settable=True)
-    notes_public = SimpleField(settable=True)
+    rating = SimpleField(writable=True)
+    notes = SimpleField(writable=True)
+    notes_public = SimpleField(writable=True)
     release = ObjectField('Release', key='basic_information')
 
     def __init__(self, client, dict_):
@@ -526,6 +526,7 @@ class CollectionFolder(PrimaryAPIObject):
     id = SimpleField()
     name = SimpleField()
     count = SimpleField()
+
     def __init__(self, client, dict_):
         super(CollectionFolder, self).__init__(client, dict_)
 
@@ -565,7 +566,7 @@ class Order(PrimaryAPIObject):
     next_status = SimpleField()
     shipping_address = SimpleField()
     additional_instructions = SimpleField()
-    status = SimpleField(settable=True)
+    status = SimpleField(writable=True)
     fee = ObjectField('Price')
     buyer = ObjectField('User')
     seller = ObjectField('User')

From f752ebfb2115e7994f7fca6acddd549127cd2690 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 15 Dec 2011 16:45:18 -0800
Subject: [PATCH 22/52] Add ObjectCollection field for easy PaginatedList
 properties.

---
 discogs_client/models.py | 75 +++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index c787854..cf623ed 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -99,6 +99,40 @@ def __set__(self, instance, value):
         raise AttributeError("can't set attribute")
 
 
+class ObjectCollectionDescriptor(object):
+    """
+    An attribute that determines its value by fetching a URL to a paginated
+    list of related objects, and passes each item in the resulting list through
+    an APIObject.
+
+    Shorthand for:
+
+        @property
+        def frozzes(self):
+            return PaginatedList(self.client, self.fetch('frozzes_url'), 'frozzes', FrozClass)
+    """
+    def __init__(self, name, class_name, url_key=None, list_class=None):
+        self.name = name
+        self.class_name = class_name
+
+        if url_key is None:
+            url_key = name + '_url'
+        self.url_key = url_key
+
+        if list_class is None:
+            list_class = PaginatedList
+        self.list_class = list_class
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+        wrapper_class = CLASS_MAP[self.class_name.lower()]
+        return self.list_class(instance.client, instance.fetch(self.url_key), self.name, wrapper_class)
+
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+
 class Field(object):
     """
     A placeholder for a descriptor. Is transformed into a descriptor by the
@@ -134,6 +168,11 @@ class ObjectField(Field):
     _descriptor_class = ObjectFieldDescriptor
 
 
+class ObjectCollection(Field):
+    """A field that returns a paginated list of APIObjects."""
+    _descriptor_class = ObjectCollectionDescriptor
+
+
 class APIObjectMeta(type):
     def __new__(cls, name, bases, dict_):
         for k, v in dict_.iteritems():
@@ -416,15 +455,12 @@ class Master(PrimaryAPIObject):
     videos = ListField('Video')
     tracklist = ListField('Track')
     main_release = ObjectField('Release', as_id=True)
+    versions = ObjectCollection('Release')
 
     def __init__(self, client, dict_):
         super(Master, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/masters/%d' % dict_['id']
 
-    @property
-    def versions(self):
-        return PaginatedList(self.client, self.fetch('versions_url'), 'versions', Release)
-
     def __repr__(self):
         return '<Master %r %r>' % (self.id, self.title)
 
@@ -439,15 +475,12 @@ class Label(PrimaryAPIObject):
     data_quality = SimpleField()
     sublabels = ListField('Label')
     parent_label = ObjectField('Label', as_id=True, optional=True)
+    releases = ObjectCollection('Release')
 
     def __init__(self, client, dict_):
         super(Label, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/labels/%d' % dict_['id']
 
-    @property
-    def releases(self):
-        return PaginatedList(self.client, self.fetch('releases_url'), 'releases', Release)
-
     def __repr__(self):
         return '<Label %r %r>' % (self.id, self.name)
 
@@ -461,28 +494,22 @@ class User(PrimaryAPIObject):
     num_lists = SimpleField()
     rank = SimpleField()
     rating_avg = SimpleField()
-    name = SimpleField(settable=True)
-    profile = SimpleField(settable=True)
-    location = SimpleField(settable=True)
-    home_page = SimpleField(settable=True)
+    name = SimpleField(writable=True)
+    profile = SimpleField(writable=True)
+    location = SimpleField(writable=True)
+    home_page = SimpleField(writable=True)
     registered = SimpleField(transform=parse_timestamp)
+    inventory = ObjectCollection('Listing', key='listings', url_key='inventory_url')
+    wantlist = ObjectCollection('WantlistItem', key='wants', url_key='wantlist_url', list_class=Wantlist)
 
     def __init__(self, client, dict_):
         super(User, self).__init__(client, dict_)
         self.data['resource_url'] = client._base_url + '/users/%s' % dict_['username']
 
-    @property
-    def inventory(self):
-        return PaginatedList(self.client, self.fetch('inventory_url'), 'listings', Listing)
-
     @property
     def orders(self):
         return PaginatedList(self.client, self.client._base_url + '/marketplace/orders', 'orders', Order)
 
-    @property
-    def wantlist(self):
-        return Wantlist(self.client, self.fetch('wantlist_url'), 'wants', WantlistItem)
-
     @property
     def collection_folders(self):
         resp = self.client._get(self.fetch('collection_folders_url'))
@@ -572,6 +599,7 @@ class Order(PrimaryAPIObject):
     seller = ObjectField('User')
     created = SimpleField(transform=parse_timestamp)
     last_activity = SimpleField(transform=parse_timestamp)
+    messages = ObjectCollection('OrderMessage', list_class=OrderMessagesList)
 
     def __init__(self, client, dict_):
         super(Order, self).__init__(client, dict_)
@@ -587,10 +615,6 @@ def shipping(self):
     def shipping(self, value):
         self.changes['shipping'] = value
 
-    @property
-    def messages(self):
-        return OrderMessagesList(self.client, self.fetch('messages_url'), 'messages', OrderMessage)
-
     def __repr__(self):
         return '<Order %r>' % self.id
 
@@ -645,4 +669,7 @@ def __repr__(self):
     'track': Track,
     'user': User,
     'order': Order,
+    'listing': Listing,
+    'wantlistitem': WantlistItem,
+    'ordermessage': OrderMessage,
 }

From c4e2abb507365409fff3682033ff4af720e9a352 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Fri, 30 Dec 2011 09:46:50 -0800
Subject: [PATCH 23/52] Rename helpers module to utils.

---
 discogs_client/client.py                | 2 +-
 discogs_client/models.py                | 2 +-
 discogs_client/{helpers.py => utils.py} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename discogs_client/{helpers.py => utils.py} (100%)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index bde6004..a7032f0 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -6,7 +6,7 @@
 
 from discogs_client import models
 from discogs_client.exceptions import ConfigurationError, HTTPError
-from discogs_client.helpers import update_qs
+from discogs_client.utils import update_qs
 
 class Client(object):
     _base_url = 'http://api.discogs.com'
diff --git a/discogs_client/models.py b/discogs_client/models.py
index cf623ed..8b067f0 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -1,5 +1,5 @@
 from discogs_client.exceptions import HTTPError
-from discogs_client.helpers import parse_timestamp, update_qs, omit_none
+from discogs_client.utils import parse_timestamp, update_qs, omit_none
 
 
 class SimpleFieldDescriptor(object):
diff --git a/discogs_client/helpers.py b/discogs_client/utils.py
similarity index 100%
rename from discogs_client/helpers.py
rename to discogs_client/utils.py

From 61c2a6709ff101e14fbc0df2e992a14fe5096d4b Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Fri, 30 Dec 2011 11:20:34 -0800
Subject: [PATCH 24/52] Consider PrimaryAPIObject instances equal if their IDs
 are.

---
 discogs_client/models.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 8b067f0..1442012 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -193,6 +193,15 @@ def __init__(self, client, dict_):
         self._known_invalid_keys = []
         self.changes = {}
 
+    def __eq__(self, other):
+        if isinstance(other, self.__class__):
+            return self.id == other.id
+        return NotImplemented
+
+    def __ne__(self, other):
+        equal = self.__eq__(other)
+        return NotImplemented if equal is NotImplemented else not equal
+
     def refresh(self):
         if self.data.get('resource_url'):
             data = self.client._get(self.data['resource_url'])

From 6d8b07c64a0114382660a8c14170314ffc15a07d Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Fri, 30 Dec 2011 15:48:55 -0800
Subject: [PATCH 25/52] Sanity check on user_agent.

---
 discogs_client/client.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index a7032f0..6e41f01 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -79,6 +79,8 @@ def _request(self, method, url, data=None):
         if self.verbose:
             print ' '.join((method, url))
 
+        self._check_user_agent()
+
         headers = {
             'Accept-Encoding': 'gzip',
             'User-Agent': self.user_agent,

From 6305f3672a6138f1bc362ceef3352d223a0fe7ab Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 11:50:43 -0800
Subject: [PATCH 26/52] Fix unquoted characters in query string.

---
 discogs_client/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/discogs_client/utils.py b/discogs_client/utils.py
index 698fc83..e061d37 100644
--- a/discogs_client/utils.py
+++ b/discogs_client/utils.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from urllib2 import quote
 
 def parse_timestamp(timestamp):
     """Convert an ISO 8601 timestamp into a datetime."""
@@ -7,7 +8,7 @@ def parse_timestamp(timestamp):
 
 def update_qs(url, params):
     """A not-very-intelligent function to glom parameters onto a query string."""
-    joined_qs = '&'.join('='.join((str(k), str(v))) for k, v in params.iteritems())
+    joined_qs = '&'.join('='.join((str(k), quote(str(v)))) for k, v in params.iteritems())
     separator = '&' if '?' in url else '?'
     return url + separator + joined_qs
 

From cf7e2ef6e664c0c0f178f0facdba52808f716f77 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 13:05:34 -0800
Subject: [PATCH 27/52] Fix improperly-mapped keys on Artists and Labels.

---
 discogs_client/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 1442012..ed5932f 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -399,10 +399,10 @@ def _transform(self, item):
 class Artist(PrimaryAPIObject):
     id = SimpleField()
     name = SimpleField()
-    real_name = SimpleField()
+    real_name = SimpleField(key='realname')
     profile = SimpleField()
     data_quality = SimpleField()
-    name_variations = SimpleField()
+    name_variations = SimpleField(key='namevariations')
     urls = SimpleField()
     aliases = ListField('Artist')
     members = ListField('Artist')
@@ -483,7 +483,7 @@ class Label(PrimaryAPIObject):
     contact_info = SimpleField()
     data_quality = SimpleField()
     sublabels = ListField('Label')
-    parent_label = ObjectField('Label', as_id=True, optional=True)
+    parent_label = ObjectField('Label', optional=True)
     releases = ObjectCollection('Release')
 
     def __init__(self, client, dict_):

From b5864f70d475e456cbdaed7321215e0ffb22db97 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 14:47:13 -0800
Subject: [PATCH 28/52] Invalidate PaginatedList subclasses after they change.

---
 discogs_client/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index ed5932f..a7e69d7 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -363,10 +363,12 @@ def add(self, release, notes=None, notes_public=None, rating=None):
             'rating': rating,
         }
         self.client._put(self.url + '/' + str(release_id), omit_none(data))
+        self._invalidate()
 
     def remove(self, release):
         release_id = release.id if isinstance(release, Release) else release
         self.client._delete(self.url + '/' + str(release_id))
+        self._invalidate()
 
 
 class OrderMessagesList(PaginatedList):
@@ -378,6 +380,7 @@ def add(self, message=None, status=None, email_buyer=True, email_seller=False):
             'email_seller': email_seller,
         }
         self.client._post(self.url, omit_none(data))
+        self._invalidate()
 
 
 class MixedPaginatedList(BasePaginatedResponse):

From 0a8fbf74b97bddc621619bb25b83ee78e0a83986 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 15:03:01 -0800
Subject: [PATCH 29/52] Limit fee precision to 4 decimal places.

---
 discogs_client/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index 6e41f01..a1dd424 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -158,7 +158,7 @@ def order(self, id):
         return models.Order(self, {'id': id})
 
     def fee_for(self, price, currency='USD'):
-        resp = self._get(self._base_url + '/marketplace/fee/%f/%s' % (float(price), currency))
+        resp = self._get(self._base_url + '/marketplace/fee/%0.4f/%s' % (float(price), currency))
         return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
 
     def identity(self):

From 65662c318892940640e3cffa358fab7352c02e2a Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 15:29:49 -0800
Subject: [PATCH 30/52] Modularize data fetching so it can be swapped out in
 testing.

---
 discogs_client/client.py   |  63 ++++++---------------
 discogs_client/fetchers.py | 109 +++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+), 45 deletions(-)
 create mode 100644 discogs_client/fetchers.py

diff --git a/discogs_client/client.py b/discogs_client/client.py
index a1dd424..501aef3 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -2,11 +2,11 @@
 import json
 import oauth2
 import urllib
-import urlparse
 
 from discogs_client import models
 from discogs_client.exceptions import ConfigurationError, HTTPError
 from discogs_client.utils import update_qs
+from discogs_client.fetchers import RequestsFetcher, OAuth2Fetcher
 
 class Client(object):
     _base_url = 'http://api.discogs.com'
@@ -17,59 +17,42 @@ class Client(object):
     def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_token=None, access_secret=None):
         self.user_agent = user_agent
         self.verbose = False
-        self.authenticated = False
-
-        self._consumer = None
-        self._oauth_client = None
-        self._token = None
 
         if consumer_key and consumer_secret:
-            self._consumer = oauth2.Consumer(consumer_key, consumer_secret)
-
-            if access_token and access_secret:
-                self._token = oauth2.Token(access_token, access_secret)
-                self.authenticated = True
-
-            self._oauth_client = oauth2.Client(self._consumer, self._token)
+            self._fetcher = OAuth2Fetcher(consumer_key, consumer_secret, access_token, access_secret)
+        else:
+            self._fetcher = RequestsFetcher()
 
     def get_authorize_url(self, callback_url=None):
         # Forget existing tokens
-        self._oauth_client = oauth2.Client(self._consumer)
+        self._fetcher.forget_token()
 
         params = {}
         if callback_url:
             params['oauth_callback'] = callback_url
         postdata = urllib.urlencode(params)
 
-        resp, content = self._oauth_client.request(self._request_token_url, 'POST', body=postdata)
-        if resp['status'] != '200':
-            raise HTTPError('Invalid response from request token URL.', int(resp['status']))
-        self._token = dict(urlparse.parse_qsl(content))
+        content, status_code = self._fetcher.fetch(self, 'POST', self._request_token_url, data=postdata, json=False)
+        if status_code != 200:
+            raise HTTPError('Invalid response from request token URL.', status_code)
 
-        params = {'oauth_token': self._token['oauth_token']}
+        token, secret = self._fetcher.store_token_from_qs(content)
+
+        params = {'oauth_token': token}
         query_string = urllib.urlencode(params)
 
         return '?'.join((self._authorize_url, query_string))
 
     def get_access_token(self, verifier):
-        token = oauth2.Token(
-            self._token['oauth_token'],
-            self._token['oauth_token_secret'],
-        )
-        token.set_verifier(verifier)
-        self._oauth_client = oauth2.Client(self._consumer, token)
+        self._fetcher.set_verifier(verifier)
 
-        resp, content = self._oauth_client.request(self._access_token_url, 'POST')
-        self._token = dict(urlparse.parse_qsl(content))
+        content, status_code = self._fetcher.fetch(self, 'POST', self._access_token_url)
+        if status_code != 200:
+            raise HTTPError('Invalid response from access token URL.', status_code)
 
-        token = oauth2.Token(
-            self._token['oauth_token'],
-            self._token['oauth_token_secret'],
-        )
-        self._oauth_client = oauth2.Client(self._consumer, token)
-        self.authenticated = True
+        token, secret = self._fetcher.store_token_from_qs(content)
 
-        return self._token['oauth_token'], self._token['oauth_token_secret']
+        return token, secret
 
     def _check_user_agent(self):
         if not self.user_agent:
@@ -89,17 +72,7 @@ def _request(self, method, url, data=None):
         if data:
             headers['Content-Type'] = 'application/json'
 
-        if self.authenticated:
-            if data:
-                body = json.dumps(data)
-                resp, content = self._oauth_client.request(url, method, body, headers=headers)
-            else:
-                resp, content = self._oauth_client.request(url, method, headers=headers)
-            status_code = int(resp['status'])
-        else:
-            response = requests.request(method, url, data=data, headers=headers)
-            content = response.content
-            status_code = response.status_code
+        content, status_code = self._fetcher.fetch(self, method, url, data=data, headers=headers)
 
         if status_code == 204:
             return None
diff --git a/discogs_client/fetchers.py b/discogs_client/fetchers.py
new file mode 100644
index 0000000..1fe67f5
--- /dev/null
+++ b/discogs_client/fetchers.py
@@ -0,0 +1,109 @@
+import requests
+import oauth2
+import json
+import urlparse
+import os
+
+class Fetcher(object):
+    """
+    Base class for Fetchers, which wrap and normalize the APIs of various HTTP
+    libraries.
+
+    (It's a slightly leaky abstraction designed to make testing easier.)
+    """
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        # Should return (content, status_code)
+        raise NotImplemented
+
+
+class LoggingDelegator(object):
+    """Wraps a fetcher and logs all requests."""
+    def __init__(self, fetcher):
+        self.fetcher = fetcher
+        self.requests = []
+
+    @property
+    def last_request(self):
+        return self.requests[-1] if self.requests else None
+
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        self.requests.append((method, url, data, headers))
+        return self.fetcher.fetch(client, method, url, data, headers, json)
+
+
+class RequestsFetcher(Fetcher):
+    """Fetches via HTTP from the Discogs API."""
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        resp = requests.request(method, url, data=data, headers=headers)
+        return resp.content, resp.status_code
+
+
+class OAuth2Fetcher(Fetcher):
+    """Fetches via HTTP + OAuth 1.0a from the Discogs API."""
+    def __init__(self, consumer_key, consumer_secret, access_token=None, access_secret=None):
+        consumer = oauth2.Consumer(consumer_key, consumer_secret)
+        token = None
+
+        if access_token and access_secret:
+            token = oauth2.Token(access_token, access_secret)
+
+        self.oauth_client = oauth2.Client(consumer, token)
+
+    def store_token_from_qs(self, query_string):
+        token_dict = dict(urlparse.parse_qsl(query_string))
+        token = token_dict['oauth_token']
+        secret = token_dict['oauth_token_secret']
+        self.store_token(token, secret)
+        return token, secret
+
+    def forget_token(self):
+        self.oauth_client.token = None
+
+    def store_token(self, token, secret):
+        self.oauth_client.token = oauth2.Token(token, secret)
+
+    def set_verifier(self, verifier):
+        self.oauth_client.token.set_verifier(verifier)
+
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        if data:
+            body = json.dumps(data) if json else data
+            resp, content = self.oauth_client.request(url, method, body, headers=headers)
+        else:
+            resp, content = self.oauth_client.request(url, method, headers=headers)
+        return content, int(resp['status'])
+
+
+class FilesystemFetcher(Fetcher):
+    """Fetches from a directory of files."""
+    default_response = json.dumps({'message': 'Resource not found.'}), 404
+
+    def __init__(self, base_path):
+        self.base_path = base_path
+
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        url = url.replace(client._base_url, '')
+
+        if json:
+            base_name = ''.join((url[1:], '.json'))
+        else:
+            base_name = url[1:]
+
+        path = os.path.join(self.base_path, base_name)
+        try:
+            with open(path, 'r') as f:
+                content = f.read()
+            return content, 200
+        except:
+            return self.default_response
+
+
+class MemoryFetcher(Fetcher):
+    """Fetches from a dict of URL -> (content, status_code)."""
+    default_response = json.dumps({'message': 'Resource not found.'}), 404
+
+    def __init__(self, responses):
+        self.responses = responses
+
+    def fetch(self, client, method, url, data=None, headers=None, json=True):
+        return self.responses.get(url, self.default_response)

From 8c48c77ef7828c6befd73ed233017f0af02ac695 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 15:32:07 -0800
Subject: [PATCH 31/52] Make the README more of a quickstart guide.

---
 README.mkd | 273 ++++++++++++++++-------------------------------------
 1 file changed, 79 insertions(+), 194 deletions(-)

diff --git a/README.mkd b/README.mkd
index 73a609a..f2ce7e9 100644
--- a/README.mkd
+++ b/README.mkd
@@ -1,215 +1,100 @@
 # Discogs API Client
 
-This is the official Discogs API client for Python. You can use it to query the
-Discogs music database for metadata on artists, releases, and more.
+This is the official Discogs API client for Python. It enables you to query the
+Discogs database for information on artists, releases, labels, users,
+Marketplace listings, and more. It also supports OAuth 1.0a authorization,
+which allows you to change user data such as profile information, collections
+and wantlists, inventory, and orders.
 
 ## Installation
 
 Install the client from PyPI using your favorite package manager.
 
-    $ pip install discogs-client
+    ```sh
+    $ pip install discogs_client
+    ```
 
-## Usage
+## Quickstart
 
-### Setup
+### Instantiating the client object
 
-    >>> import discogs_client as discogs
+    ```python
+    >>> import discogs_client
+    >>> d = discogs_client.Client('ExampleApplication/0.1')
+    ```
 
-You also need to set the User-Agent of your client to something unique before you can make requests -- preferably something that follows [RFC 1945](http://tools.ietf.org/html/rfc1945#section-3.7). **Don't just use one of these examples!** Make it your own; this will help us get in touch with you if your client is behaving incorrectly.
+### Authorization (optional)
 
-    >>> discogs.user_agent = 'AwesomeDiscogsBrowser/0.1 +http://adb.example.com'
-    >>> discogs.user_agent = 'LibraryMetadataEnhancer/0.3 +http://example.com/lime'
-    >>> discogs.user_agent = 'MyDiscogsClient/1.0 +http://mydiscogsclient.org'
+Specify your app's consumer key and secret:
 
-### Getting data
+    ```python
+    >>> d = discogs_client.Client(
+    ...     'UserAgentString/0.1',
+    ...     'consumer-key-here',
+    ...     'consumer-secret-here'
+    ... )
+    ```
 
-There are five classes you can use to fetch data from the API:
+Then go through the OAuth 1.0a process. In a web app, we'd specify a
+`callback_url`; here we'll use the OOB flow.
 
- * `Artist`
- * `Release`
- * `MasterRelease`
- * `Label`
- * and `Search`.
-
-Whereever possible, the Discogs client tries to convert API responses into these
-objects. This enables you to drill down into the object graph as far as you
-like.
-
-For example, `Artist`s have two convenience properties -- `aliases` and
-`releases` -- which return `Artist` and `Release` objects. To get at the
-remainder of an object's metadata, use the `data` dictionary, which contains the
-raw information received from the API.
-
-    >>> discogs.Artist('Aphex Twin').data['realname']
-    u'...'
-
-## Artist
+    ```python
+    >>> d.get_authorize_url()
+    'http://www.discogs.com/oauth/authorize?...'
+    ```
     
-Query for an artist using the artist's name:
-
-    >>> artist = discogs.Artist('Aphex Twin')
-    >>> print artist
-    <Artist "...">
-    >>> 'name' in artist.data.keys()
+Visit the URL, authorize, and get the verifier:
+
+    ```python
+    >>> d.get_access_token('verifier-here')
+    ('access-token-here', 'access-secret-here')
+    ```
+
+Now you can make requests on behalf of the user.
+
+    ```python
+    >>> me = d.identity()
+    >>> "I'm %s (%s) from %s." % (me.name, me.username, me.location)
+    u"I'm Joe Bloggs (example) from Portland, Oregon."
+    >>> len(me.wantlist)
+    3
+    >>> me.wantlist.add(d.release(5))
+    >>> len(me.wantlist)
+    4
+    ```
+
+### Fetching data
+
+Use methods on the client to fetch objects. You can search for objects:
+
+    ```python
+    >>> results = d.search('Stockholm By Night', type='release')
+    >>> results.pages
+    1
+    >>> artist = results[0].artists[0]
+    >>> artist.name
+    u'Persuader, The'
+    ```
+
+Or fetch them by ID:
+
+    ```python
+    >>> artist.id
+    1
+    >>> artist == d.artist(1)
     True
+    ```
 
-### Special properties
-
-Get a list of `Artist`s representing this artist's aliases:
-
-    >>> artist.aliases
-    [...]
-
-Get a list of `Release`s by this artist:
-
-    >>> artist.releases
-    [...]
-
-### Possible `data` keys
-
-* images
-* members
-* name
-* namevariations
-* realname
-* urls
-
-## Release
-
-Query for a release using its Discogs ID:
-
-    >>> release = discogs.Release(1)
-    
-### Special properties
-
-Get the title of this `Release`:
-
-    >>> release.title
-    u'...'
-
-Get a list of all `Artist`s associated with this `Release`:
-
-    >>> release.artists
-    [<Artist "...">]
-
-Get the tracklist for this `Release`:
-
-    >>> release.tracklist
-    [...]
-
-Get the `MasterRelease` for this `Release`:
-
-    >>> release.master
-    <MasterRelease "...">
-
-Get a list of all `Label`s for this `Release`:
-
-    >>> release.labels
-    [...]
-
-### Possible `data` keys
-
-* country
-* formats
-* genres
-* id
-* images
-* notes
-* released_formatted
-* released
-* status
-* styles
-* year
-
-## MasterRelease
-
-Query for a master release using its Discogs ID:
-
-    >>> master_release = discogs.MasterRelease(5427)
-
-### Special properties
+You can drill down as far as you like.
 
-Get the key `Release` for this `MasterRelease`:
-
-    >>> master_release.key_release
-    <Release "...">
-
-Get the title of this `MasterRelease`:
-
-    >>> master_release.title
-    u'...'
-    >>> master_release.title == master_release.key_release.title
-    True
-
-Get a list of all `Artist`s associated with this `MasterRelease`:
-
-    >>> master_release.artists
-    [<Artist "...">]
-
-Get a list of `Release`s representing other versions of this `MasterRelease`:
-
-    >>> master_release.versions
-    [...]
-
-Get the tracklist for this `MasterRelease`:
-
-    >>> master_release.tracklist
-    [...]
-
-### Possible `data` keys
-
- * genres
- * id
- * images
- * styles
- * year
-
-## Label
-
-Query for a label using the label's name:
-
-    >>> label = discogs.Label('Warp Records')
-
-### Special properties
-
-Get a list of `Release`s from this `Label`:
-
-    >>> label.releases
-    [...]
-
-Get a list of `Label`s representing sublabels associated with this `Label`:
-
-    >>> label.sublabels
-    [...]
-
-Get the `Label`'s parent label, if it exists:
-
-    >>> label.parent_label
-    ...
-
-### Possible `data` keys
-
-* contactinfo
-* images
-* name
-* profile
-* urls
-
-## Search
-
-To search the database, pass your query into a `Search`:
-
-    >>> s = discogs.Search('autechre')
-
-There may be results that exactly match your query:
-
-    >>> s.exactresults
-    [...]
-    
-Any other results are paginated:
+    ```python
+    >>> releases = d.search('Bit Shifter', type='artist')[0].releases[1].\
+    ...     versions[0].labels[0].releases
+    >>> len(releases)
+    134
+    ```
 
-    >>> s.results()
-    [...]
-    >>> s.results(page=2)
-    [...]
+### For more information
 
+Check the included documentation, or just spin up a REPL and use `dir()` on
+things :)

From e485dc010aea433fc9d1da71ae3d73e173a3cd6e Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 15:34:16 -0800
Subject: [PATCH 32/52] Tests! And a tree full of fixtures for mocking out the
 API.

---
 discogs_client/tests/__init__.py              |  48 ++++++
 discogs_client/tests/res/artists/1.json       |   1 +
 .../1/releases?per_page=50&page=1.json        |   1 +
 .../1/releases?per_page=50&page=2.json        |   1 +
 discogs_client/tests/res/artists/2.json       |   1 +
 discogs_client/tests/res/artists/3.json       |   1 +
 .../search?q=trash80&per_page=50&page=1.json  |   1 +
 discogs_client/tests/res/labels/1.json        |   1 +
 discogs_client/tests/res/labels/31405.json    |   1 +
 .../res/marketplace/fee/20.5000/EUR.json      |   1 +
 discogs_client/tests/res/masters/4242.json    |   1 +
 .../4242/versions?per_page=50&page=1.json     |   1 +
 discogs_client/tests/res/oauth/identity.json  |   1 +
 discogs_client/tests/res/releases/1.json      |   1 +
 discogs_client/tests/res/releases/2.json      |   1 +
 discogs_client/tests/res/releases/3.json      |   1 +
 .../tests/res/releases/3329867.json           |   1 +
 discogs_client/tests/res/releases/79.json     |   1 +
 discogs_client/tests/res/users/example.json   |   1 +
 .../example/wants?per_page=50&page=1.json     |   1 +
 discogs_client/tests/test_core.py             | 102 ++++++++++++
 discogs_client/tests/test_fetchers.py         |  25 +++
 discogs_client/tests/test_models.py           | 150 ++++++++++++++++++
 test_discogs_client.py                        |   2 -
 24 files changed, 344 insertions(+), 2 deletions(-)
 create mode 100644 discogs_client/tests/__init__.py
 create mode 100644 discogs_client/tests/res/artists/1.json
 create mode 100644 discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json
 create mode 100644 discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json
 create mode 100644 discogs_client/tests/res/artists/2.json
 create mode 100644 discogs_client/tests/res/artists/3.json
 create mode 100644 discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json
 create mode 100644 discogs_client/tests/res/labels/1.json
 create mode 100644 discogs_client/tests/res/labels/31405.json
 create mode 100644 discogs_client/tests/res/marketplace/fee/20.5000/EUR.json
 create mode 100644 discogs_client/tests/res/masters/4242.json
 create mode 100644 discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json
 create mode 100644 discogs_client/tests/res/oauth/identity.json
 create mode 100644 discogs_client/tests/res/releases/1.json
 create mode 100644 discogs_client/tests/res/releases/2.json
 create mode 100644 discogs_client/tests/res/releases/3.json
 create mode 100644 discogs_client/tests/res/releases/3329867.json
 create mode 100644 discogs_client/tests/res/releases/79.json
 create mode 100644 discogs_client/tests/res/users/example.json
 create mode 100644 discogs_client/tests/res/users/example/wants?per_page=50&page=1.json
 create mode 100644 discogs_client/tests/test_core.py
 create mode 100644 discogs_client/tests/test_fetchers.py
 create mode 100644 discogs_client/tests/test_models.py
 delete mode 100644 test_discogs_client.py

diff --git a/discogs_client/tests/__init__.py b/discogs_client/tests/__init__.py
new file mode 100644
index 0000000..0af48ea
--- /dev/null
+++ b/discogs_client/tests/__init__.py
@@ -0,0 +1,48 @@
+import unittest
+import json
+import os
+from discogs_client import Client
+from discogs_client.fetchers import LoggingDelegator, FilesystemFetcher, \
+    MemoryFetcher
+
+class DiscogsClientTestCase(unittest.TestCase):
+    def setUp(self):
+
+        # Filesystem client
+        self.d = Client('test_client/0.1 +http://example.org')
+        self.d._base_url = ''
+        self.d._fetcher = LoggingDelegator(
+            FilesystemFetcher(os.path.dirname(os.path.abspath(__file__)) + '/res')
+        )
+        self.d._verbose = True
+
+        # Memory client
+        responses = {
+            '/artists/1': ('{"id": 1, "name": "Badger"}', 200),
+            '/500': ('{"message": "mushroom"}', 500),
+            '/204': ('', 204),
+        }
+        self.m = Client('ua')
+        self.m._base_url = ''
+        self.m._fetcher = LoggingDelegator(MemoryFetcher(responses))
+
+    def tearDown(self):
+        pass
+
+    def assertGot(self, assert_url):
+        method, url, data, headers = self.d._fetcher.last_request
+        self.assertEqual(method, 'GET')
+        self.assertEqual(url, assert_url)
+
+    def assertPosted(self, assert_url, assert_data):
+        method, url, data, headers = self.d._fetcher.last_request
+        self.assertEqual(method, 'POST')
+        self.assertEqual(url, assert_url)
+        self.assertEqual(data, json.dumps(assert_data))
+
+def suite():
+    from discogs_client.tests import test_core, test_models, test_fetchers
+    suite = unittest.TestSuite(test_core.suite())
+    suite = unittest.TestSuite(test_models.suite())
+    suite = unittest.TestSuite(test_fetchers.suite())
+    return suite
diff --git a/discogs_client/tests/res/artists/1.json b/discogs_client/tests/res/artists/1.json
new file mode 100644
index 0000000..59b6b3a
--- /dev/null
+++ b/discogs_client/tests/res/artists/1.json
@@ -0,0 +1 @@
+{"releases_url": "/artists/1/releases", "name": "Persuader, The", "namevariations": ["Persuader", "Presuader, The"], "images": [{"uri": "/image/A-1-1138987958.jpeg", "height": 450, "width": 600, "resource_url": "/image/A-1-1138987958.jpeg", "type": "secondary", "uri150": "/image/A-150-1-1138987958.jpeg"}], "resource_url": "/artists/1", "aliases": [{"resource_url": "/artists/19541", "id": 19541, "name": "Dick Track"}, {"resource_url": "/artists/278760", "id": 278760, "name": "Faxid"}, {"resource_url": "/artists/16055", "id": 16055, "name": "Groove Machine"}, {"resource_url": "/artists/196957", "id": 196957, "name": "Janne Me' Amazonen"}, {"resource_url": "/artists/239", "id": 239, "name": "Jesper Dahlb\u00e4ck"}, {"resource_url": "/artists/25227", "id": 25227, "name": "Lenk"}, {"resource_url": "/artists/439150", "id": 439150, "name": "Pinguin Man, The"}], "id": 1, "data_quality": "Correct", "realname": "Jesper Dahlb\u00e4ck"}
diff --git a/discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json b/discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json
new file mode 100644
index 0000000..5361da2
--- /dev/null
+++ b/discogs_client/tests/res/artists/1/releases?per_page=50&page=1.json
@@ -0,0 +1 @@
+{"pagination": {"per_page": 50, "pages": 2, "page": 1, "urls": {"last": "/artists/1/releases?per_page=50&page=2", "next": "/artists/1/releases?per_page=50&page=2"}, "items": 57}, "releases": [{"status": "Accepted", "thumb": "/image/R-150-20209-001.jpg", "format": "10\"", "title": "Kaos", "label": "Svek", "role": "Main", "year": 1997, "resource_url": "/releases/20209", "type": "release", "id": 20209}, {"status": "Accepted", "thumb": "/image/R-150-62584-1105012368.jpg", "format": "12\"", "title": "Snorkelmannen \u00d8 Hans V\u00e4nner", "label": "Svek", "role": "Main", "year": 1997, "resource_url": "/releases/62584", "type": "release", "id": 62584}, {"thumb": "/image/R-150-4664-1159918161.jpeg", "title": "Stockholm By Night", "main_release": 4664, "role": "Main", "year": 1997, "resource_url": "/masters/321212", "type": "master", "id": 321212}, {"status": "Accepted", "thumb": "/image/R-150-400-1318378296.jpeg", "format": "12\"", "title": "A View From Slussen", "label": "Svek", "role": "Main", "year": 1998, "resource_url": "/releases/400", "type": "release", "id": 400}, {"thumb": "/image/R-150-79-1104723687.jpg", "title": "City Of Islands", "main_release": 79, "role": "Main", "year": 1998, "resource_url": "/masters/4242", "type": "master", "id": 4242}, {"thumb": "/image/R-150-101-1171945084.jpeg", "title": "Morgon Sol", "main_release": 101, "role": "Main", "year": 1998, "resource_url": "/masters/374577", "type": "master", "id": 374577}, {"thumb": "/image/R-150-401-1194210100.jpeg", "title": "Pleasure", "main_release": 401, "role": "Main", "year": 1998, "resource_url": "/masters/4250", "type": "master", "id": 4250}, {"thumb": "/image/R-150-1-1193812031.jpeg", "title": "Stockholm", "main_release": 1, "role": "Main", "year": 1999, "resource_url": "/masters/5427", "type": "master", "id": 5427}, {"status": "Accepted", "thumb": "/image/R-150-12362-001.jpg", "format": "12\"", "title": "Central Bron", "label": "Svek, Svek", "role": "Main", "year": 2001, "resource_url": "/releases/12362", "type": "release", "id": 12362}, {"status": "Accepted", "thumb": "/image/R-150-88892-1293887012.jpeg", "format": "12\"", "title": "Loves You All Night And Day", "label": "Raw Elements", "role": "Remix", "year": 1997, "trackinfo": "All Night (Stephan Gri...", "resource_url": "/releases/88892", "type": "release", "id": 88892}, {"thumb": "/image/R-150-119-1323136113.jpeg", "title": "The Big Bang Theory", "main_release": 119, "role": "Remix", "year": 1997, "resource_url": "/masters/169563", "type": "master", "id": 169563}, {"status": "Accepted", "thumb": "/image/R-150-15542-1164893602.jpeg", "format": "2x12\"", "title": "Diskophrenia Remixes", "label": "Svek", "role": "Remix", "year": 1998, "trackinfo": "Diskophrenia (The Pers...", "resource_url": "/releases/15542", "type": "release", "id": 15542}, {"status": "Accepted", "thumb": "/image/R-150-5955-1280004683.jpeg", "format": "CD, Comp", "title": "The Lords Of Svek Vol. 4", "label": "Svek", "role": "Remix", "year": 1998, "trackinfo": "Discophrenia (The Pers...", "resource_url": "/releases/5955", "type": "release", "id": 5955}, {"status": "Accepted", "thumb": "/image/R-150-229135-1077485555.jpg", "format": "2xCD, Mixed, Comp", "title": "Chill On Kaos Volume Two", "label": "Kaos Records", "role": "Remix", "year": 2001, "trackinfo": "Diskophrenia (The Pers...", "resource_url": "/releases/229135", "type": "release", "id": 229135}, {"status": "Accepted", "thumb": "/image/R-150-2629499-1294052369.jpeg", "format": "2xCDr, Comp, Promo", "title": "Raw Essentials", "label": "Raw Elements", "role": "Remix", "year": 2008, "trackinfo": "All Night ( Stephan Gr...", "resource_url": "/releases/2629499", "type": "release", "id": 2629499}, {"status": "Accepted", "thumb": "/image/R-150-2116649-1318194487.jpeg", "format": "CD, Mixed, Comp", "title": "Live At Robert Johnson", "label": "Live At Robert Johnson", "role": "Remix", "year": 2010, "trackinfo": "The Big Bang Theory (R...", "resource_url": "/releases/2116649", "type": "release", "id": 2116649}, {"status": "Accepted", "thumb": "/image/R-150-2219613-1270601189.jpeg", "format": "4xCD, Comp, Mixed + Box, Ltd, Art", "title": "Volume 1-4 - Live At Robert Johnson", "label": "Live At Robert Johnson", "role": "Remix", "year": 2010, "trackinfo": "The Big Bang Theory (R...", "resource_url": "/releases/2219613", "type": "release", "id": 2219613}, {"status": "Accepted", "thumb": "/image/R-150-20207-1136661115.jpeg", "format": "12\"", "title": "Untitled", "label": "Svek", "role": "Appearance", "year": 1997, "resource_url": "/releases/20207", "type": "release", "id": 20207}, {"thumb": "/image/R-150-125192-1221907175.jpeg", "title": "Sun Trip Fifth", "main_release": 125192, "role": "Appearance", "year": 1998, "resource_url": "/masters/44004", "type": "master", "id": 44004}, {"status": "Accepted", "thumb": "/image/R-150-17087-1282665287.jpeg", "format": "CD, Comp", "title": "The Lords Of Svek Vol. 2", "label": "Svek", "role": "TrackAppearance", "year": 1997, "trackinfo": "Bottle Up!, What Is Th...", "resource_url": "/releases/17087", "type": "release", "id": 17087}, {"thumb": "/image/R-150-336682-1098045779.jpg", "title": "Bor\u00e9alis", "main_release": 336682, "role": "TrackAppearance", "year": 1998, "resource_url": "/masters/393267", "type": "master", "id": 393267}, {"thumb": "/image/R-150-893403-1220171221.jpeg", "title": "DJ Excursions Vol. 5", "main_release": 893403, "role": "TrackAppearance", "year": 1998, "resource_url": "/masters/89174", "type": "master", "id": 89174}, {"status": "Accepted", "thumb": "/image/R-150-1795441-1294674275.jpeg", "format": "CD, Mixed, Promo, 4-f", "title": "DeeperDimensions", "label": "Not On Label", "role": "TrackAppearance", "year": 1998, "trackinfo": "I'm Glad You're Mine", "resource_url": "/releases/1795441", "type": "release", "id": 1795441}, {"thumb": "/image/R-150-186191-1264283210.jpeg", "title": "Groove - The Compilation Volume 3", "main_release": 186191, "role": "TrackAppearance", "year": 1998, "resource_url": "/masters/99684", "type": "master", "id": 99684}, {"status": "Accepted", "thumb": "/image/R-150-100650-1215061226.jpeg", "format": "2x12\"", "title": "J\u00e9r\u00f4me Pacman's House Caf\u00e9", "label": "Music Garden, Music Garden", "role": "TrackAppearance", "year": 1998, "trackinfo": "Naked Woman", "resource_url": "/releases/100650", "type": "release", "id": 100650}, {"status": "Accepted", "thumb": "/image/R-150-703264-1149629630.jpeg", "format": "CD, Mixed, Comp", "title": "J\u00e9r\u00f4me Pacman's House Caf\u00e9", "label": "Music Garden", "role": "TrackAppearance", "year": 1998, "trackinfo": "Naked Woman", "resource_url": "/releases/703264", "type": "release", "id": 703264}, {"status": "Accepted", "thumb": "/image/R-150-564791-1132090427.jpeg", "format": "CD", "title": "Le Nord Digital - Volume 2", "label": "Not On Label", "role": "TrackAppearance", "year": 1998, "trackinfo": "Funk Seven", "resource_url": "/releases/564791", "type": "release", "id": 564791}, {"status": "Accepted", "thumb": "/image/R-150-399-1164938233.jpeg", "format": "12\"", "title": "The Lords Of Svek - Unreleased", "label": "Svek", "role": "TrackAppearance", "year": 1998, "trackinfo": "Funk Seven, Tandori Funk", "resource_url": "/releases/399", "type": "release", "id": 399}, {"status": "Accepted", "thumb": "/image/R-150-17088-1272577277.jpeg", "format": "CD, Comp", "title": "The Lords Of Svek Vol. 3", "label": "Svek", "role": "TrackAppearance", "year": 1998, "trackinfo": "Stockholm By Night, Fu...", "resource_url": "/releases/17088", "type": "release", "id": 17088}, {"status": "Accepted", "thumb": "/image/R-150-5955-1280004683.jpeg", "format": "CD, Comp", "title": "The Lords Of Svek Vol. 4", "label": "Svek", "role": "TrackAppearance", "year": 1998, "trackinfo": "Naked Woman, From West...", "resource_url": "/releases/5955", "type": "release", "id": 5955}, {"status": "Accepted", "thumb": "/image/R-150-27535-1229968603.jpeg", "format": "2xCD, Comp, Mixed", "title": "hr3 Clubnight Volume 3", "label": "Epidrome", "role": "TrackAppearance", "year": 1998, "trackinfo": "Naked Woman", "resource_url": "/releases/27535", "type": "release", "id": 27535}, {"status": "Accepted", "thumb": "/image/R-150-1878188-1277474268.jpeg", "format": "CD, Mixed", "title": "Every Woman Have To Drive A Car", "label": "Not On Label", "role": "TrackAppearance", "year": 1999, "trackinfo": "From West To South, \u00d6...", "resource_url": "/releases/1878188", "type": "release", "id": 1878188}, {"status": "Accepted", "thumb": "/image/R-150-2387641-1281604069.jpeg", "format": "CD, Smplr, Promo", "title": "Goldhead Music Dance Sampler Spring 99", "label": "Goldhead Music", "role": "TrackAppearance", "year": 1999, "trackinfo": "S\u00f6dermalm", "resource_url": "/releases/2387641", "type": "release", "id": 2387641}, {"status": "Accepted", "thumb": "/image/R-150-49823-1198920037.jpeg", "format": "CD", "title": "Moving House At Food Club", "label": "SSR Records", "role": "TrackAppearance", "year": 1999, "trackinfo": "Slussen (Erot Go Dub R...", "resource_url": "/releases/49823", "type": "release", "id": 49823}, {"thumb": "/image/R-150-782872-1158295444.jpeg", "title": "Profound Sounds Vol. 1", "main_release": 782872, "role": "TrackAppearance", "year": 1999, "resource_url": "/masters/66526", "type": "master", "id": 66526}, {"status": "Accepted", "thumb": "/image/R-150-195166-001.jpg", "format": "2xCD, Comp, Mixed", "title": "Rocks - The Real Dance Club", "label": "Kaos Records", "role": "TrackAppearance", "year": 1999, "trackinfo": "Slussen (Go Dub Mix)", "resource_url": "/releases/195166", "type": "release", "id": 195166}, {"thumb": "/image/R-150-1220-1231620321.jpeg", "title": "Stockholm Mix Sessions", "main_release": 1220, "role": "TrackAppearance", "year": 1999, "resource_url": "/masters/4207", "type": "master", "id": 4207}, {"status": "Accepted", "thumb": "/image/R-150-17089-1221689193.jpeg", "format": "CD, Comp", "title": "The Lords Of Svek - Galaxy", "label": "Svek", "role": "TrackAppearance", "year": 1999, "trackinfo": "Gamla Stan, Slussen (G...", "resource_url": "/releases/17089", "type": "release", "id": 17089}, {"thumb": "/image/R-150-1222-1231620791.jpeg", "title": "Helsinki Mix Sessions", "main_release": 1222, "role": "TrackAppearance", "year": 2000, "resource_url": "/masters/53892", "type": "master", "id": 53892}, {"status": "Accepted", "thumb": "/image/R-150-873142-1167841584.jpeg", "format": "CD", "title": "Helsinki Mix Sessions Vol. 2", "label": "Not On Label", "role": "TrackAppearance", "year": 2000, "trackinfo": "From West To South", "resource_url": "/releases/873142", "type": "release", "id": 873142}, {"thumb": "/image/R-150-66978-1197498609.jpeg", "title": "Transatlantic Audio", "main_release": 66978, "role": "TrackAppearance", "year": 2000, "resource_url": "/masters/35961", "type": "master", "id": 35961}, {"status": "Accepted", "thumb": "/image/R-150-45799-1324409617.jpeg", "format": "CD, Comp, Mixed", "title": "Skansen Music", "label": "Glasgow Underground", "role": "TrackAppearance", "year": 2001, "trackinfo": "Slussen (Go Dub Mix)", "resource_url": "/releases/45799", "type": "release", "id": 45799}, {"status": "Accepted", "thumb": "/image/R-150-92419-1302423552.jpeg", "format": "CD, Mixed", "title": "Soundcolors 4", "label": "X:treme Records", "role": "TrackAppearance", "year": 2001, "trackinfo": "Gamla Stan", "resource_url": "/releases/92419", "type": "release", "id": 92419}, {"status": "Accepted", "format": "CD, Comp, Mixed", "title": "Straight To DAT", "label": "Blended Music", "role": "TrackAppearance", "year": 2001, "trackinfo": "Playing Your Game", "resource_url": "/releases/118402", "type": "release", "id": 118402}, {"status": "Accepted", "thumb": "/image/R-150-45094-001.gif", "format": "CD, Comp", "title": "Defender", "label": "Svek", "role": "TrackAppearance", "year": 2002, "trackinfo": "Central Bron (Birdy Re...", "resource_url": "/releases/45094", "type": "release", "id": 45094}, {"status": "Accepted", "thumb": "/image/R-150-73804-001.jpg", "format": "CD, Comp, Mixed", "title": "Moon Harbour Flights Volume One", "label": "Moon Harbour Recordings", "role": "TrackAppearance", "year": 2002, "trackinfo": "Str\u00f6msbron", "resource_url": "/releases/73804", "type": "release", "id": 73804}, {"status": "Accepted", "thumb": "/image/R-150-167072-001.jpg", "format": "CD, Comp", "title": "Seven Years Of Svek Collection One", "label": "Svek", "role": "TrackAppearance", "year": 2003, "trackinfo": "Central Bron, Kaos", "resource_url": "/releases/167072", "type": "release", "id": 167072}, {"status": "Accepted", "thumb": "/image/R-150-777443-1158753680.jpeg", "format": "CD, Mixed", "title": "She's A Dancing Machine", "label": "M_nus", "role": "TrackAppearance", "year": 2006, "trackinfo": "Centralbron, Centralbron", "resource_url": "/releases/777443", "type": "release", "id": 777443}, {"thumb": "/image/R-150-1584766-1304303959.jpeg", "title": "Carry On - Pretend We Are Not In The Room", "main_release": 1584766, "role": "TrackAppearance", "year": 2008, "resource_url": "/masters/48841", "type": "master", "id": 48841}, {"status": "Accepted", "thumb": "/image/R-150-1600427-1231356335.jpeg", "format": "File, MP3, Mixed, Comp, 192", "title": "LWE Podcast 03", "label": "Little White Earbuds", "role": "TrackAppearance", "year": 2008, "trackinfo": "What Is The Time, Mr. ...", "resource_url": "/releases/1600427", "type": "release", "id": 1600427}]}
diff --git a/discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json b/discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json
new file mode 100644
index 0000000..3d724da
--- /dev/null
+++ b/discogs_client/tests/res/artists/1/releases?per_page=50&page=2.json
@@ -0,0 +1 @@
+{"pagination": {"per_page": 50, "items": 57, "page": 2, "urls": {"prev": "/artists/1/releases?per_page=50&page=1", "first": "/artists/1/releases?per_page=50&page=1"}, "pages": 2}, "releases": [{"status": "Accepted", "thumb": "/image/R-150-3244318-1322087916.jpeg", "title": "RA.113", "format": "File, MP3, Mixed, 160", "label": "Resident Advisor", "role": "TrackAppearance", "year": 2008, "trackinfo": "What Is The Time, Mr. ...", "resource_url": "/releases/3244318", "type": "release", "id": 3244318}, {"status": "Accepted", "thumb": "/image/R-150-1642564-1234063013.jpeg", "title": "RA.116", "format": "File, MP3, Mixed, Pod", "label": "Resident Advisor", "role": "TrackAppearance", "year": 2008, "trackinfo": "A View From Slussen (G...", "resource_url": "/releases/1642564", "type": "release", "id": 1642564}, {"status": "Accepted", "thumb": "/image/R-150-2562307-1290561180.jpeg", "title": "Seeing Colors : Ghostly Influences", "format": "File, MP3, Mixed, 320", "label": "Ghostly International", "role": "TrackAppearance", "year": 2009, "trackinfo": "What Is The Time, Mr. ...", "resource_url": "/releases/2562307", "type": "release", "id": 2562307}, {"status": "Accepted", "thumb": "/image/R-150-1637849-1233766204.jpeg", "title": "The Empty Foxhole", "format": "CD, Comp, Mixed", "label": "Mule Electronic", "role": "TrackAppearance", "year": 2009, "trackinfo": "Kaos", "resource_url": "/releases/1637849", "type": "release", "id": 1637849}, {"status": "Accepted", "thumb": "/image/R-150-2894432-1306081588.jpeg", "title": "House Party Mix", "format": "File, MP3, Mixed, Comp, Promo, 320", "label": "Ed Banger Records", "role": "TrackAppearance", "year": 2010, "trackinfo": "Bottle Up", "resource_url": "/releases/2894432", "type": "release", "id": 2894432}, {"thumb": "/image/R-150-2911949-1311921995.jpeg", "title": "Dan Ghenacia's Sound Of The City - Paris", "main_release": 2911949, "role": "TrackAppearance", "year": 2011, "resource_url": "/masters/340995", "type": "master", "id": 340995}, {"status": "Accepted", "thumb": "/image/R-150-1692004-1237256913.jpeg", "title": "SMUT", "format": "CD, Mixed, Comp", "label": ":6:6:6 ZipCode Town Rekkids", "role": "TrackAppearance", "trackinfo": "Snorkelmannen 0 Hans V...", "resource_url": "/releases/1692004", "type": "release", "id": 1692004}]}
diff --git a/discogs_client/tests/res/artists/2.json b/discogs_client/tests/res/artists/2.json
new file mode 100644
index 0000000..9fb918f
--- /dev/null
+++ b/discogs_client/tests/res/artists/2.json
@@ -0,0 +1 @@
+{"releases_url": "/artists/2/releases", "namevariations": ["Mr Barth & A.D.", "Mr. Barth & A.D."], "data_quality": "Correct", "members": [{"resource_url": "/artists/26", "id": 26, "name": "Alexi Delano"}, {"resource_url": "/artists/27", "id": 27, "name": "Cari Lekebusch"}], "resource_url": "/artists/2", "aliases": [{"resource_url": "/artists/384581", "id": 384581, "name": "ADCL"}, {"resource_url": "/artists/1779857", "id": 1779857, "name": "Alexi Delano & Cari Lekebusch"}, {"resource_url": "/artists/103709", "id": 103709, "name": "Crushed Insect & The Sick Puppy"}, {"resource_url": "/artists/2470", "id": 2470, "name": "Puente Latino"}, {"resource_url": "/artists/19536", "id": 19536, "name": "Yakari & Delano"}], "id": 2, "realname": "Cari Lekebusch & Alexi Delano", "name": "Mr. James Barth & A.D."}
diff --git a/discogs_client/tests/res/artists/3.json b/discogs_client/tests/res/artists/3.json
new file mode 100644
index 0000000..46c4538
--- /dev/null
+++ b/discogs_client/tests/res/artists/3.json
@@ -0,0 +1 @@
+{"profile": "After forming [l=Ovum Recordings] as an independent label in October 1994 with former partner [a=King Britt], Josh recorded the cult classic 'Liquid Summer'. He went on to release singles for a wide variety of revered European labels ranging from Belgium's [l=R & S Records] to England's [l=XL Recordings]. In 1995, Wink became one of the first DJ-producers to translate his hard work into mainstream success when he unleashed a string of classics including 'Don't Laugh'\u00b8 'I'm Ready' and 'Higher State of Consciousness' that topped charts worldwide. More recently he has had massive club hits such as 'How's Your Evening So Far' and 'Superfreak' but he has also gained a lot of attention trough his remixes for [a=FC Kahuna], [a=Paul Oakenfold], [a=Ladytron], [a=Clint Mansell], [a=Sting] and [a=Depeche Mode], among others.", "releases_url": "/artists/3/releases", "name": "Josh Wink", "groups": [{"resource_url": "/artists/55692", "id": 55692, "name": "Abundance Of Cups"}, {"resource_url": "/artists/34803", "id": 34803, "name": "E-Culture"}, {"resource_url": "/artists/1642275", "id": 1642275, "name": "Force, The (23)"}, {"resource_url": "/artists/579249", "id": 579249, "name": "Jack Jones (4)"}, {"resource_url": "/artists/844878", "id": 844878, "name": "Just King And Wink"}], "namevariations": ["DJ Josh Wink", "DJ Wink", "J Wink", "J. Wink", "J. Wink (DJ  Wink)", "J. Winkelman", "J. Winkelmann", "J.Wink", "J.Winkelman", "Josh", "Josh Wink (DJ Wink)", "Josh Wink Aka Winx", "Josh Winkelman", "Josh Winkelmann", "Josh Winx", "JW", "Winc", "Wink", "Wink (Feat The Interpreters)", "Winks", "Winx", "Winxs"], "urls": ["http://www.joshwink.com/", "http://www.ovum-rec.com/", "http://www.myspace.com/joshwink", "http://www.myspace.com/ovumrecordings", "http://www.deejaybooking.com/joshwink", "http://twitter.com/joshwink1"], "images": [{"uri": "/image/A-3-1105100757.jpg", "height": 370, "width": 399, "resource_url": "/image/A-3-1105100757.jpg", "type": "secondary", "uri150": "/image/A-150-3-1105100757.jpg"}, {"uri": "/image/A-3-1105100775.gif", "height": 199, "width": 200, "resource_url": "/image/A-3-1105100775.gif", "type": "secondary", "uri150": "/image/A-150-3-1105100775.gif"}, {"uri": "/image/A-3-1197950724.jpeg", "height": 436, "width": 550, "resource_url": "/image/A-3-1197950724.jpeg", "type": "secondary", "uri150": "/image/A-150-3-1197950724.jpeg"}, {"uri": "/image/A-3-1222848084.jpeg", "height": 280, "width": 380, "resource_url": "/image/A-3-1222848084.jpeg", "type": "secondary", "uri150": "/image/A-150-3-1222848084.jpeg"}, {"uri": "/image/A-3-1222848102.jpeg", "height": 661, "width": 600, "resource_url": "/image/A-3-1222848102.jpeg", "type": "secondary", "uri150": "/image/A-150-3-1222848102.jpeg"}, {"uri": "/image/A-3-1222848119.jpeg", "height": 630, "width": 500, "resource_url": "/image/A-3-1222848119.jpeg", "type": "secondary", "uri150": "/image/A-150-3-1222848119.jpeg"}, {"uri": "/image/A-3-1237576157.jpeg", "height": 288, "width": 219, "resource_url": "/image/A-3-1237576157.jpeg", "type": "primary", "uri150": "/image/A-150-3-1237576157.jpeg"}], "resource_url": "/artists/3", "aliases": [{"resource_url": "/artists/370936", "id": 370936, "name": "Accent (3)"}, {"resource_url": "/artists/95949", "id": 95949, "name": "Crusher, The"}, {"resource_url": "/artists/284057", "id": 284057, "name": "Dinky Dog"}, {"resource_url": "/artists/870371", "id": 870371, "name": "J. Dawg"}, {"resource_url": "/artists/11217", "id": 11217, "name": "Size 9"}], "id": 3, "data_quality": "Correct", "realname": "Joshua Winkelman"}
diff --git a/discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json b/discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json
new file mode 100644
index 0000000..eb6fb3d
--- /dev/null
+++ b/discogs_client/tests/res/database/search?q=trash80&per_page=50&page=1.json
@@ -0,0 +1 @@
+{"pagination": {"per_page": 50, "pages": 1, "page": 1, "urls": {}, "items": 13}, "results": [{"thumb": null, "title": "Trash80", "uri": "/artist/Trash80", "resource_url": "/artists/95780", "type": "artist", "id": 95780}, {"style": ["Electro", "Chiptune"], "thumb": "/image/R-90-1743771-1272253277.gif", "title": "Trash80 - Icarus", "country": "US", "format": ["CDr"], "uri": "/Trash80-Icarus/release/1743771", "label": "8bitpeoples", "catno": "8BP086", "year": "2008", "genre": ["Electronic"], "resource_url": "/releases/1743771", "type": "release", "id": 1743771}, {"style": ["Electro", "Chiptune"], "thumb": "/image/R-90-1346442-1211545307.gif", "title": "Trash80 - Icarus", "country": "US", "format": ["File"], "uri": "/Trash80-Icarus/release/1346442", "label": "8bitpeoples", "catno": "8BP086", "year": "2008", "genre": ["Electronic"], "resource_url": "/releases/1346442", "type": "release", "id": 1346442}, {"style": ["Chiptune"], "thumb": "/image/R-90-480740-1149028432.gif", "title": "Trash80 - Hologram", "country": "US", "format": ["File"], "uri": "/Trash80-Hologram/release/480740", "label": "8bitpeoples", "catno": "8BP037", "year": "2003", "genre": ["Electronic"], "resource_url": "/releases/480740", "type": "release", "id": 480740}, {"style": ["Modern Classical", "Chiptune", "Breaks", "Ambient"], "thumb": "/image/R-90-3329867-1326034108.jpeg", "title": "Trash80 & Dma-Sc - Darwinia Soundtrack", "country": "UK", "format": ["File"], "uri": "/Trash80-Dma-Sc-Darwinia-Soundtrack/release/3329867", "label": "Not On Label", "catno": "none", "year": "2005", "genre": ["Electronic"], "resource_url": "/releases/3329867", "type": "release", "id": 3329867}, {"style": ["Chiptune"], "thumb": "/image/R-90-1554401-1227991910.gif", "title": "Nullsleep - Unconditional Acceleration", "country": "US", "format": ["File"], "uri": "/Nullsleep-Unconditional-Acceleration/release/1554401", "label": "8bitpeoples", "catno": "8BP088", "year": "2008", "genre": ["Electronic"], "resource_url": "/releases/1554401", "type": "release", "id": 1554401}, {"style": ["Chiptune"], "thumb": "/image/R-90-2634760-1294296299.gif", "title": "Sievert - Chips, Dips And Facerips", "country": "US", "format": ["File"], "uri": "/Sievert-Chips-Dips-And-Facerips/release/2634760", "label": "8bitpeoples", "catno": "8BP113", "year": "2011", "genre": ["Electronic"], "resource_url": "/releases/2634760", "type": "release", "id": 2634760}, {"style": ["Chiptune"], "thumb": "/image/R-90-1554411-1228435569.jpeg", "title": "Minusbaby - Saudade For Beginners", "country": "US", "format": ["File", "CD"], "uri": "/Minusbaby-Saudade-For-Beginners/release/1554411", "label": "8bitpeoples", "catno": "8BP089", "year": "2008", "genre": ["Electronic"], "resource_url": "/releases/1554411", "type": "release", "id": 1554411}, {"style": ["Abstract", "Musique Concr\u00e8te", "Experimental"], "thumb": null, "title": "Larry Wendt - Sound Poems For An Era Of Reduced Expectations", "country": "US", "format": ["Cassette"], "uri": "/Larry-Wendt-Sound-Poems-For-An-Era-Of-Reduced-Expectations/release/2674683", "label": "Underwhich Audiographics", "catno": "5", "genre": ["Electronic", "Non-Music"], "resource_url": "/releases/2674683", "type": "release", "id": 2674683}, {"style": ["Breakbeat", "Interview", "Techno", "IDM", "Minimal"], "thumb": null, "title": "Datamat - Interjamp Realaudio Special", "country": "Germany", "format": ["File"], "uri": "/Datamat-Interjamp-Realaudio-Special/release/1994383", "label": "Interjamp Radio", "catno": "inter004", "year": "2004", "genre": ["Electronic", "Non-Music"], "resource_url": "/releases/1994383", "type": "release", "id": 1994383}, {"style": ["IDM", "Noise", "Experimental"], "thumb": "/image/R-90-132406-1177641432.jpeg", "title": "Various - One Minute Massacre Volume 1", "country": "", "format": ["CD"], "uri": "/Various-One-Minute-Massacre-Volume-1/release/132406", "label": "Soulseek Records", "catno": "SLSK002", "year": "2003", "genre": ["Electronic"], "resource_url": "/releases/132406", "type": "release", "id": 132406}, {"style": ["Chiptune", "Experimental"], "thumb": "/image/R-90-915735-1229262615.jpeg", "title": "Various - 8BP050", "country": "US", "format": ["CD", "File"], "uri": "/Various-8BP050/release/915735", "label": "8bitpeoples", "catno": "8BP050", "year": "2006", "genre": ["Electronic"], "resource_url": "/releases/915735", "type": "release", "id": 915735}, {"style": ["Electro", "Chiptune"], "thumb": "/image/R-90-1903567-1251600832.jpeg", "title": "Various - Blip Festival 2008: 32 Live Recordings", "country": "US", "format": ["CD"], "uri": "/Various-Blip-Festival-2008-32-Live-Recordings/release/1903567", "label": "8bitpeoples", "catno": "8BP100", "year": "2009", "genre": ["Electronic"], "resource_url": "/releases/1903567", "type": "release", "id": 1903567}]}
diff --git a/discogs_client/tests/res/labels/1.json b/discogs_client/tests/res/labels/1.json
new file mode 100644
index 0000000..c37b8f5
--- /dev/null
+++ b/discogs_client/tests/res/labels/1.json
@@ -0,0 +1 @@
+{"profile": "Classic Techno label from Detroit, USA.\r\n[b]Label owner:[/b] [a=Carl Craig].\r\n", "releases_url": "/labels/1/releases", "name": "Planet E", "contact_info": "Planet E Communications\r\nP.O. Box 27218\r\nDetroit, 48227, USA\r\n\r\np: 313.874.8729 \r\nf: 313.874.8732\r\n\r\nemail: info AT Planet-e DOT net\r\n", "sublabels": [{"resource_url": "/labels/86537", "id": 86537, "name": "Antidote (4)"}, {"resource_url": "/labels/41841", "id": 41841, "name": "Community Projects"}, {"resource_url": "/labels/153760", "id": 153760, "name": "Guilty Pleasures"}, {"resource_url": "/labels/31405", "id": 31405, "name": "I Ner Zon Sounds"}], "urls": ["http://www.planet-e.net/", "http://www.myspace.com/planetecom", "http://www.facebook.com/planetedetroit ", "http://twitter.com/planetedetroit", "http://soundcloud.com/planetedetroit"], "images": [{"uri": "/image/L-1-1111053865.png", "height": 24, "width": 132, "resource_url": "/image/L-1-1111053865.png", "type": "primary", "uri150": "/image/L-150-1-1111053865.png"}, {"uri": "/image/L-1-1139403654.gif", "height": 126, "width": 587, "resource_url": "/image/L-1-1139403654.gif", "type": "secondary", "uri150": "/image/L-150-1-1139403654.gif"}, {"uri": "/image/L-1-1200165078.gif", "height": 196, "width": 600, "resource_url": "/image/L-1-1200165078.gif", "type": "secondary", "uri150": "/image/L-150-1-1200165078.gif"}, {"uri": "/image/L-1-1258998163.png", "height": 121, "width": 275, "resource_url": "/image/L-1-1258998163.png", "type": "secondary", "uri150": "/image/L-150-1-1258998163.png"}, {"uri": "/image/L-1-1279985473.jpeg", "height": 204, "width": 600, "resource_url": "/image/L-1-1279985473.jpeg", "type": "secondary", "uri150": "/image/L-150-1-1279985473.jpeg"}], "resource_url": "/labels/1", "id": 1, "data_quality": "Needs Vote"}
diff --git a/discogs_client/tests/res/labels/31405.json b/discogs_client/tests/res/labels/31405.json
new file mode 100644
index 0000000..cfd0919
--- /dev/null
+++ b/discogs_client/tests/res/labels/31405.json
@@ -0,0 +1 @@
+{"profile": "I Ner Zon Sounds was a sublabel of [l=Planet E], only used by [a=Carl Craig] for the Naomi Daniel project.", "releases_url": "/labels/31405/releases", "name": "I Ner Zon Sounds", "parent_label": {"resource_url": "/labels/1", "id": 1, "name": "Planet E"}, "resource_url": "/labels/31405", "id": 31405, "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/marketplace/fee/20.5000/EUR.json b/discogs_client/tests/res/marketplace/fee/20.5000/EUR.json
new file mode 100644
index 0000000..a7609a5
--- /dev/null
+++ b/discogs_client/tests/res/marketplace/fee/20.5000/EUR.json
@@ -0,0 +1 @@
+{"currency": "USD", "value": 1.5700000000000001}
diff --git a/discogs_client/tests/res/masters/4242.json b/discogs_client/tests/res/masters/4242.json
new file mode 100644
index 0000000..a05899c
--- /dev/null
+++ b/discogs_client/tests/res/masters/4242.json
@@ -0,0 +1 @@
+{"styles": ["Deep House", "Tech House"], "genres": ["Electronic"], "videos": [{"duration": 328, "embed": true, "title": "The Persuader - Djurgardsbron - Svek Records", "description": "The Persuader - Djurgardsbron - Svek Records", "uri": "http://www.youtube.com/watch?v=QLgJ1E7COnM"}, {"duration": 299, "embed": true, "title": "The Persuader - Stromsbron - Svek Records", "description": "The Persuader - Stromsbron - Svek Records", "uri": "http://www.youtube.com/watch?v=FUsihJaFmkE"}, {"duration": 264, "embed": true, "title": "The Persuader - Centralbron", "description": "The Persuader - Centralbron", "uri": "http://www.youtube.com/watch?v=ta5KOlw-dOk"}], "title": "City Of Islands", "main_release": 79, "main_release_url": "/releases/79", "year": 1998, "versions_url": "/masters/4242/versions", "artists": [{"join": "", "name": "Persuader, The", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/1", "id": 1}], "images": [{"uri": "/image/R-79-1104723687.jpg", "height": 150, "width": 150, "resource_url": "/image/R-79-1104723687.jpg", "type": "secondary", "uri150": "/image/R-150-79-1104723687.jpg"}], "resource_url": "/masters/4242", "tracklist": [{"duration": "5:12", "position": "A1", "title": "Djurg\u00e5rdsbron"}, {"duration": "4:20", "position": "A2", "title": "Centralbron"}, {"duration": "4:47", "position": "B1", "title": "Str\u00f6msbron"}, {"duration": "4:42", "position": "B2", "title": "Kungsbron"}], "id": 4242, "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json b/discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json
new file mode 100644
index 0000000..7930ed6
--- /dev/null
+++ b/discogs_client/tests/res/masters/4242/versions?per_page=50&page=1.json
@@ -0,0 +1 @@
+{"pagination": {"per_page": 50, "pages": 1, "page": 1, "urls": {}, "items": 2}, "versions": [{"status": "Accepted", "thumb": "/image/R-150-79-1104723687.jpg", "format": "12\"", "country": "Sweden", "title": "City Of Islands", "label": "Svek", "released": "1998-12-00", "catno": "SK029", "resource_url": "/releases/79", "id": 79}, {"status": "Accepted", "format": "12\", W/Lbl", "country": "Sweden", "title": "City Of Islands", "label": "Svek", "released": "1998-12-00", "catno": "SK029", "resource_url": "/releases/1657054", "id": 1657054}]}
diff --git a/discogs_client/tests/res/oauth/identity.json b/discogs_client/tests/res/oauth/identity.json
new file mode 100644
index 0000000..5c46c00
--- /dev/null
+++ b/discogs_client/tests/res/oauth/identity.json
@@ -0,0 +1 @@
+{"username": "example", "id": 1, "resource_url": "/users/example", "consumer_name": "Test Client"}
diff --git a/discogs_client/tests/res/releases/1.json b/discogs_client/tests/res/releases/1.json
new file mode 100644
index 0000000..f24e3a8
--- /dev/null
+++ b/discogs_client/tests/res/releases/1.json
@@ -0,0 +1 @@
+{"status": "Accepted", "videos": [{"duration": 334, "embed": true, "title": "The Persuader-Stockholm-Sodermalm", "description": "The Persuader-Stockholm-Sodermalm", "uri": "http://www.youtube.com/watch?v=QVdDhOnoR8k"}, {"duration": 290, "embed": true, "title": "The Persuader (Jesper Dahlb\u00e4ck) - \u00d6stermalm", "description": "The Persuader (Jesper Dahlb\u00e4ck) - \u00d6stermalm", "uri": "http://www.youtube.com/watch?v=AHuQWcylaU4"}], "series": [], "labels": [{"name": "Svek", "entity_type": "1", "catno": "SK032", "resource_url": "/labels/5", "id": 5, "entity_type_name": "Label"}], "year": 1999, "images": [{"uri": "/image/R-1-1193812031.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-1-1193812031.jpeg", "type": "primary", "uri150": "/image/R-150-1-1193812031.jpeg"}, {"uri": "/image/R-1-1193812053.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-1-1193812053.jpeg", "type": "secondary", "uri150": "/image/R-150-1-1193812053.jpeg"}, {"uri": "/image/R-1-1193812072.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-1-1193812072.jpeg", "type": "secondary", "uri150": "/image/R-150-1-1193812072.jpeg"}, {"uri": "/image/R-1-1193812091.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-1-1193812091.jpeg", "type": "secondary", "uri150": "/image/R-150-1-1193812091.jpeg"}], "id": 1, "genres": ["Electronic"], "thumb": "/image/R-150-1-1193812031.jpeg", "extraartists": [{"join": "", "name": "Jesper Dahlb\u00e4ck", "anv": "", "tracks": "", "role": "Music By [All Tracks By]", "resource_url": "/artists/239", "id": 239}], "title": "Stockholm", "artists": [{"join": "", "name": "Persuader, The", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/1", "id": 1}], "master_id": 5427, "tracklist": [{"duration": "4:45", "position": "A", "title": "\u00d6stermalm"}, {"duration": "6:11", "position": "B1", "title": "Vasastaden"}, {"duration": "2:49", "position": "B2", "title": "Kungsholmen"}, {"duration": "5:38", "position": "C1", "title": "S\u00f6dermalm"}, {"duration": "4:52", "position": "C2", "title": "Norrmalm"}, {"duration": "5:16", "position": "D", "title": "Gamla Stan"}], "styles": ["Deep House"], "released_formatted": "Mar 1999", "master_url": "/masters/5427", "released": "1999-03-00", "country": "Sweden", "notes": "Recorded at the Globe studio in Stockholm. \r\nThe titles are the names of Stockholm's districts.\r\n", "companies": [{"name": "The Globe Studios", "entity_type": "23", "catno": "", "resource_url": "/labels/271046", "id": 271046, "entity_type_name": "Recorded At"}], "formats": [{"qty": "2", "descriptions": ["12\""], "name": "Vinyl"}], "resource_url": "/releases/1", "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/releases/2.json b/discogs_client/tests/res/releases/2.json
new file mode 100644
index 0000000..6a7e3d6
--- /dev/null
+++ b/discogs_client/tests/res/releases/2.json
@@ -0,0 +1 @@
+{"styles": ["Broken Beat", "Techno", "Tech House"], "videos": [{"duration": 302, "description": "Mr James Barth & A D    Above the Skyline", "embed": true, "uri": "http://www.youtube.com/watch?v=evmVOtBhIp0", "title": "Mr James Barth & A D    Above the Skyline"}, {"duration": 292, "description": "Mr. James Barth & A.D. - Yeah Kid!", "embed": true, "uri": "http://www.youtube.com/watch?v=n46f_3EbFTg", "title": "Mr. James Barth & A.D. - Yeah Kid!"}], "series": [], "labels": [{"id": 5, "resource_url": "/labels/5", "catno": "SK 026", "name": "Svek", "entity_type": ""}, {"id": 5, "resource_url": "/labels/5", "catno": "SK026", "name": "Svek", "entity_type": ""}], "year": 1998, "artists": [{"join": "", "name": "Mr. James Barth & A.D.", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/2", "id": 2}], "images": [{"uri": "/image/R-2-1151006967.jpeg", "height": 394, "width": 400, "resource_url": "/image/R-2-1151006967.jpeg", "type": "primary", "uri150": "/image/R-150-2-1151006967.jpeg"}, {"uri": "/image/R-2-1193657839.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-2-1193657839.jpeg", "type": "secondary", "uri150": "/image/R-150-2-1193657839.jpeg"}, {"uri": "/image/R-2-1193657861.jpeg", "height": 600, "width": 600, "resource_url": "/image/R-2-1193657861.jpeg", "type": "secondary", "uri150": "/image/R-150-2-1193657861.jpeg"}], "id": 2, "genres": ["Electronic"], "thumb": "/image/R-150-2-1151006967.jpeg", "extraartists": [{"join": "", "name": "Alexi Delano", "anv": "", "tracks": "", "role": "Producer, Recorded By", "resource_url": "/artists/26", "id": 26}, {"join": "", "name": "Cari Lekebusch", "anv": "", "tracks": "", "role": "Producer, Recorded By", "resource_url": "/artists/27", "id": 27}, {"join": "", "name": "Alexi Delano", "anv": "A. Delano", "tracks": "", "role": "Written-By", "resource_url": "/artists/26", "id": 26}, {"join": "", "name": "Cari Lekebusch", "anv": "C. Lekebusch", "tracks": "", "role": "Written-By", "resource_url": "/artists/27", "id": 27}], "title": "Knockin' Boots Vol 2 Of 2", "master_id": 248927, "tracklist": [{"duration": "5:08", "position": "A1", "title": "A Sea Apart"}, {"duration": "4:21", "position": "A2", "title": "Dutchmaster"}, {"duration": "4:22", "position": "B1", "title": "Inner City Lullaby"}, {"duration": "4:46", "position": "B2", "title": "Yeah Kid!"}], "status": "Accepted", "released_formatted": "Jun 1998", "master_url": "/masters/248927", "released": "1998-06-00", "country": "Sweden", "notes": "All joints recorded in NYC (Dec.97).", "identifiers": [{"type": "Matrix / Runout", "description": "Side A Runout Etching", "value": "MPO SK026-A -J.T.S.-"}, {"type": "Matrix / Runout", "description": "Side B Runout Etching", "value": "MPO SK026-B -J.T.S.-"}], "companies": [], "formats": [{"descriptions": ["12\"", "33 \u2153 RPM"], "name": "Vinyl", "qty": "1"}], "resource_url": "/releases/2", "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/releases/3.json b/discogs_client/tests/res/releases/3.json
new file mode 100644
index 0000000..f8b21a1
--- /dev/null
+++ b/discogs_client/tests/res/releases/3.json
@@ -0,0 +1 @@
+{"status": "Accepted", "videos": [{"duration": 337, "embed": true, "title": "Profound Sounds Vol.1 - Josh Wink", "description": "Profound Sounds Vol.1 - Josh Wink", "uri": "http://www.youtube.com/watch?v=poF7kq2m-Ko"}], "series": [], "labels": [{"name": "Ruffhouse Records", "entity_type": "1", "catno": "CK 63628", "resource_url": "/labels/6", "id": 6, "entity_type_name": "Label"}], "year": 1999, "images": [{"uri": "/image/R-3-1287135004.jpeg", "height": 600, "width": 593, "resource_url": "/image/R-3-1287135004.jpeg", "type": "primary", "uri150": "/image/R-150-3-1287135004.jpeg"}], "id": 3, "genres": ["Electronic"], "thumb": "/image/R-150-3-1287135004.jpeg", "extraartists": [{"join": "", "name": "Josh Wink", "anv": "", "tracks": "", "role": "DJ Mix", "resource_url": "/artists/3", "id": 3}], "title": "Profound Sounds Vol. 1", "artists": [{"join": "", "name": "Josh Wink", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/3", "id": 3}], "master_id": 66526, "tracklist": [{"duration": "7:00", "position": "1", "artists": [{"join": "&", "name": "Heiko Laux", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/5", "id": 5}, {"join": "", "name": "Johannes Heil", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/4", "id": 4}], "title": "Untitled 8"}, {"duration": "5:28", "position": "2", "artists": [{"join": "", "name": "Karl Axel Bissler", "anv": "K.A.B.", "tracks": "", "role": "", "resource_url": "/artists/15525", "id": 15525}], "title": "Anjua (Sneaky 3)"}, {"duration": "5:25", "position": "3", "artists": [{"join": "", "name": "Sylk 130", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/7", "id": 7}], "extraartists": [{"join": "", "name": "Mood II Swing", "anv": "", "tracks": "", "role": "Remix", "resource_url": "/artists/8", "id": 8}], "title": "When The Funk Hits The Fan (Mood II Swing When The Dub Hits The Fan)"}, {"duration": "4:27", "position": "4", "artists": [{"join": "", "name": "Persuader, The", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/1", "id": 1}], "title": "What's The Time, Mr. Templar"}, {"duration": "5:36", "position": "5", "artists": [{"join": "", "name": "Care Company (2)", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/267132", "id": 267132}], "title": "Vol. 2"}, {"duration": "3:37", "position": "6", "artists": [{"join": "", "name": "Gez Varley", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/6981", "id": 6981}], "title": "Political Prisoner"}, {"duration": "5:03", "position": "7", "artists": [{"join": "", "name": "DJ Dozia", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/11", "id": 11}], "title": "Pop Kulture"}, {"duration": "5:42", "position": "8", "artists": [{"join": "Meets", "name": "Nerio's Dubwork", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/10702", "id": 10702}, {"join": "", "name": "Kathy Lee", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/233190", "id": 233190}], "extraartists": [{"join": "", "name": "Alex Hi-Fi", "anv": "", "tracks": "", "role": "Remix", "resource_url": "/artists/23", "id": 23}], "title": "K-Mart Shopping (Hi-Fi Mix)"}, {"duration": "5:47", "position": "9", "artists": [{"join": "", "name": "Blaze", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/13", "id": 13}], "extraartists": [{"join": "", "name": "Eight Miles High", "anv": "", "tracks": "", "role": "Remix", "resource_url": "/artists/14", "id": 14}], "title": "Lovelee Dae (Eight Miles High Mix)"}, {"duration": "6:06", "position": "10", "artists": [{"join": "Presents", "name": "Stacey Pullen", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/67226", "id": 67226}, {"join": "", "name": "Black Odyssey", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/7554", "id": 7554}], "extraartists": [{"join": "", "name": "Stacey Pullen", "anv": "", "tracks": "", "role": "Presenter", "resource_url": "/artists/67226", "id": 67226}], "title": "Sweat"}, {"duration": "3:16", "position": "11", "artists": [{"join": "", "name": "Christian Smith & John Selway", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/3906", "id": 3906}], "title": "Silver"}, {"duration": "2:46", "position": "12", "artists": [{"join": "", "name": "Josh Wink", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/3", "id": 3}], "title": "Untitled"}, {"duration": "3:41", "position": "13", "artists": [{"join": "", "name": "Sound Associates", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/19", "id": 19}], "title": "Boom Box"}, {"duration": "3:39", "position": "14", "artists": [{"join": "", "name": "Percy X", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/20", "id": 20}], "title": "Track 2"}], "styles": ["Techno", "Tech House"], "released_formatted": "13 Jul 1999", "master_url": "/masters/66526", "released": "1999-07-13", "country": "US", "notes": "1: Track title is given as \"D2\" (which is the side of record on the vinyl version of i220-010 release). This was also released on CD where this track is listed on 8th position. On both version no titles are given (only writing/producing credits). You can see both versions of i220-010 <a href=\"http://www.discogs.com/Heiko-Laux-The-Oldschoolstreet/master/27265\">here.</a> Additionally this track contains female vocals that aren't present on original i220-010 release. \r\n4: Credited as J. Dahlb\u00e4ck. \r\n5: Track title wrongly given as \"Vol. 1\". \r\n6: Credited as Gez Varley presents Tony Montana. \r\n12: Track exclusive to Profound Sounds Vol. 1.\n", "identifiers": [{"type": "Barcode", "value": "074646362822"}], "companies": [{"name": "Columbia Records", "entity_type": "10", "catno": "", "resource_url": "/labels/93330", "id": 93330, "entity_type_name": "Manufactured By"}, {"name": "Columbia Records", "entity_type": "9", "catno": "", "resource_url": "/labels/93330", "id": 93330, "entity_type_name": "Distributed By"}], "formats": [{"qty": "1", "descriptions": ["Compilation", "Mixed"], "name": "CD"}], "resource_url": "/releases/3", "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/releases/3329867.json b/discogs_client/tests/res/releases/3329867.json
new file mode 100644
index 0000000..de6e158
--- /dev/null
+++ b/discogs_client/tests/res/releases/3329867.json
@@ -0,0 +1 @@
+{"status": "Accepted", "styles": ["Modern Classical", "Chiptune", "Breaks", "Ambient"], "genres": ["Electronic"], "formats": [{"text": "320 kbps", "qty": "6", "descriptions": ["MP3", "Album"], "name": "File"}], "thumb": "/image/R-150-3329867-1326034108.jpeg", "extraartists": [], "title": "Darwinia Soundtrack", "series": [], "released_formatted": "2005", "labels": [{"name": "Not On Label", "entity_type": "1", "catno": "none", "resource_url": "/labels/1818", "id": 1818, "entity_type_name": "Label"}], "companies": [], "artists": [{"join": "&", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}, {"join": "", "name": "Dma-Sc", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/216524", "id": 216524}], "released": "2005", "images": [{"uri": "/image/R-3329867-1326034108.jpeg", "height": 339, "width": 342, "resource_url": "/image/R-3329867-1326034108.jpeg", "type": "primary", "uri150": "/image/R-150-3329867-1326034108.jpeg"}, {"uri": "/image/R-3329867-1326034115.jpeg", "height": 334, "width": 428, "resource_url": "/image/R-3329867-1326034115.jpeg", "type": "secondary", "uri150": "/image/R-150-3329867-1326034115.jpeg"}], "country": "UK", "year": 2005, "resource_url": "/releases/3329867", "tracklist": [{"duration": "5:30", "position": "1", "artists": [{"join": "", "name": "Dma-Sc", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/216524", "id": 216524}], "title": "Visitors From Dreams"}, {"duration": "5:46", "position": "2", "artists": [{"join": "", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}], "title": "Excuses"}, {"duration": "3:42", "position": "3", "artists": [{"join": "", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}], "title": "Schroeder's Failure"}, {"duration": "3:36", "position": "4", "artists": [{"join": "", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}], "title": "Pain Fade Down"}, {"duration": "3:41", "position": "5", "artists": [{"join": "", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}], "title": "Impact Of Silence"}, {"duration": "4:38", "position": "6", "artists": [{"join": "", "name": "Trash80", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/95780", "id": 95780}], "title": "Faces Of A Fashion"}], "id": 3329867, "data_quality": "Needs Vote"}
diff --git a/discogs_client/tests/res/releases/79.json b/discogs_client/tests/res/releases/79.json
new file mode 100644
index 0000000..3bd09c8
--- /dev/null
+++ b/discogs_client/tests/res/releases/79.json
@@ -0,0 +1 @@
+{"styles": ["Deep House", "Tech House"], "videos": [{"duration": 328, "description": "The Persuader - Djurgardsbron - Svek Records", "embed": true, "uri": "http://www.youtube.com/watch?v=QLgJ1E7COnM", "title": "The Persuader - Djurgardsbron - Svek Records"}, {"duration": 299, "description": "The Persuader - Stromsbron - Svek Records", "embed": true, "uri": "http://www.youtube.com/watch?v=FUsihJaFmkE", "title": "The Persuader - Stromsbron - Svek Records"}, {"duration": 264, "description": "The Persuader - Centralbron", "embed": true, "uri": "http://www.youtube.com/watch?v=ta5KOlw-dOk", "title": "The Persuader - Centralbron"}], "series": [], "labels": [{"id": 5, "resource_url": "/labels/5", "catno": "SK029", "name": "Svek", "entity_type": ""}], "year": 1998, "artists": [{"join": "", "name": "Persuader, The", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/1", "id": 1}], "images": [{"uri": "/image/R-79-1104723687.jpg", "height": 150, "width": 150, "resource_url": "/image/R-79-1104723687.jpg", "type": "secondary", "uri150": "/image/R-150-79-1104723687.jpg"}], "id": 79, "genres": ["Electronic"], "thumb": "/image/R-150-79-1104723687.jpg", "extraartists": [{"join": "", "name": "Jesper Dahlb\u00e4ck", "anv": "", "tracks": "", "role": "Producer, Written-By", "resource_url": "/artists/239", "id": 239}], "title": "City Of Islands", "master_id": 4242, "tracklist": [{"duration": "5:12", "position": "A1", "title": "Djurg\u00e5rdsbron"}, {"duration": "4:20", "position": "A2", "title": "Centralbron"}, {"duration": "4:47", "position": "B1", "title": "Str\u00f6msbron"}, {"duration": "4:42", "position": "B2", "title": "Kungsbron"}], "status": "Accepted", "released_formatted": "Dec 1998", "master_url": "/masters/4242", "released": "1998-12-00", "country": "Sweden", "notes": "Recorded at the Globe Studio, Stockholm.", "companies": [], "formats": [{"descriptions": ["12\""], "name": "Vinyl", "qty": "1"}], "resource_url": "/releases/79", "data_quality": "Correct"}
diff --git a/discogs_client/tests/res/users/example.json b/discogs_client/tests/res/users/example.json
new file mode 100644
index 0000000..1b0efa6
--- /dev/null
+++ b/discogs_client/tests/res/users/example.json
@@ -0,0 +1 @@
+{"username": "example", "profile": "I'm an example user!", "num_lists": 0, "name": "Example Sampleman", "num_for_sale": 3, "collection_fields_url": "/users/example/collection/fields", "home_page": "http://www.example.com/", "wantlist_url": "/users/example/wants", "registered": "2011-01-01T00:00:42", "inventory_url": "/users/example/inventory", "rating_avg": 3.14, "num_collection": 14, "rank": 1.0, "releases_rated": 8, "releases_contributed": 0, "location": "Example Town, Exampland", "num_pending": 0, "collection_folders_url": "/users/example/collection/folders", "resource_url": "/users/example", "num_wantlist": 3, "id": 1}
diff --git a/discogs_client/tests/res/users/example/wants?per_page=50&page=1.json b/discogs_client/tests/res/users/example/wants?per_page=50&page=1.json
new file mode 100644
index 0000000..6c1aebc
--- /dev/null
+++ b/discogs_client/tests/res/users/example/wants?per_page=50&page=1.json
@@ -0,0 +1 @@
+{"wants": [{"rating": 4, "basic_information": {"labels": [{"id": 2311, "resource_url": "/labels/2311", "catno": "B0008764-02", "name": "Interscope Records", "entity_type": ""}], "formats": [{"descriptions": ["Album"], "text": "Digipak", "name": "CD", "qty": "1"}], "thumb": "/image/R-150-1867708-1248886216.jpeg", "title": "Year Zero", "artists": [{"join": "", "name": "Nine Inch Nails", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/3857", "id": 3857}], "resource_url": "/releases/1867708", "year": 2007, "id": 1867708}, "notes": "Sample public notes.", "notes_public": true, "resource_url": "/users/example/wants/1867708", "id": 1867708}, {"rating": 3, "resource_url": "/users/example/wants/1675174", "basic_information": {"labels": [{"id": 141550, "resource_url": "/labels/141550", "catno": "NORM007", "name": "Normative", "entity_type": ""}], "formats": [{"descriptions": ["Album"], "name": "CDr", "qty": "1"}], "thumb": "/image/R-150-1675174-1236118359.jpeg", "title": "Dawn Metropolis", "artists": [{"join": "", "name": "Anamanaguchi", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/667233", "id": 667233}], "resource_url": "/releases/1675174", "year": 2009, "id": 1675174}, "id": 1675174, "notes_public": false}, {"rating": 0, "resource_url": "/users/example/wants/1", "basic_information": {"labels": [{"name": "Svek", "entity_type": "1", "catno": "SK032", "resource_url": "/labels/5", "id": 5, "entity_type_name": "Label"}], "formats": [{"descriptions": ["12\""], "name": "Vinyl", "qty": "2"}], "thumb": "/image/R-150-1-1193812031.jpeg", "title": "Stockholm", "artists": [{"join": "", "name": "Persuader, The", "anv": "", "tracks": "", "role": "", "resource_url": "/artists/1", "id": 1}], "resource_url": "/releases/1", "year": 1999, "id": 1}, "id": 1, "notes_public": false}], "pagination": {"per_page": 50, "items": 3, "page": 1, "urls": {}, "pages": 1}}
diff --git a/discogs_client/tests/test_core.py b/discogs_client/tests/test_core.py
new file mode 100644
index 0000000..1eab471
--- /dev/null
+++ b/discogs_client/tests/test_core.py
@@ -0,0 +1,102 @@
+import unittest
+from discogs_client import Client
+from discogs_client.tests import DiscogsClientTestCase
+from discogs_client.exceptions import ConfigurationError, HTTPError
+from datetime import datetime
+
+class CoreTestCase(DiscogsClientTestCase):
+    def test_user_agent(self):
+        """User-Agent should be properly set"""
+        self.d.artist(1).name
+
+        bad_client = Client('')
+        with self.assertRaises(ConfigurationError) as cm:
+            bad_client.artist(1).name
+
+        self.assertIn('User-Agent', str(cm.exception))
+
+    def test_caching(self):
+        """Only perform a fetch when requesting missing data"""
+        a = self.d.artist(1)
+
+        self.assertEqual(a.id, 1)
+        self.assertIsNone(self.d._fetcher.last_request)
+
+        self.assertEqual(a.name, 'Persuader, The')
+        self.assertGot('/artists/1')
+
+        self.assertEqual(a.real_name, u'Jesper Dahlb\u00e4ck')
+        self.assertEqual(len(self.d._fetcher.requests), 1)
+
+        # Get a key that's not in our cache
+        a.fetch('blorf')
+        self.assertEqual(len(self.d._fetcher.requests), 2)
+        self.assertIn('blorf', a._known_invalid_keys)
+
+        # Now we know artists don't have blorves
+        a.fetch('blorf')
+        self.assertEqual(len(self.d._fetcher.requests), 2)
+
+    def test_equality(self):
+        """APIObjects of the same class are equal if their IDs are"""
+        a1 = self.d.artist(1)
+        a1_ = self.d.artist(1)
+        a2 = self.d.artist(2)
+
+        r1 = self.d.release(1)
+
+        self.assertEqual(a1, a1_)
+        self.assertEqual(a1, r1.artists[0])
+        self.assertNotEqual(a1, r1)
+        self.assertNotEqual(r1, ':D')
+
+    def test_transform_datetime(self):
+        """String timestamps are converted to datetimes"""
+        registered = self.d.user('example').registered
+        self.assertIsInstance(registered, datetime)
+
+    def test_object_field(self):
+        """APIObjects can have APIObjects as properties"""
+        self.assertEqual(self.d.master(4242).main_release, self.d.release(79))
+
+    def test_read_only_simple_field(self):
+        """Can't write to a SimpleField when writable=False"""
+        u = self.d.user('example')
+        with self.assertRaises(AttributeError):
+            u.rank = 9001
+
+    def test_read_only_object_field(self):
+        """Can't write to an ObjectField"""
+        m = self.d.master(4242)
+        with self.assertRaises(AttributeError):
+            m.main_release = 'lol!'
+
+    def test_pagination(self):
+        """PaginatedLists are parsed correctly, indexable, and iterable"""
+        results = self.d.artist(1).releases
+
+        self.assertEqual(results.per_page, 50)
+        self.assertEqual(results.pages, 2)
+        self.assertEqual(results.count, 57)
+
+        self.assertEqual(len(results), 57)
+        self.assertEqual(len(results.page(1)), 50)
+
+        with self.assertRaises(HTTPError) as cm:
+            results.page(42)
+        self.assertEqual(cm.exception.status_code, 404)
+
+        with self.assertRaises(IndexError):
+            results[3141592]
+
+        self.assertEqual(results[0].id, 20209)
+        self.assertIn(self.d.release(20209), results)
+
+        # Changing pagination settings invalidates the cache
+        results.per_page = 10
+        self.assertIsNone(results._num_pages)
+
+def suite():
+    suite = unittest.TestSuite()
+    suite = unittest.TestLoader().loadTestsFromTestCase(CoreTestCase)
+    return suite
diff --git a/discogs_client/tests/test_fetchers.py b/discogs_client/tests/test_fetchers.py
new file mode 100644
index 0000000..8cb3e3c
--- /dev/null
+++ b/discogs_client/tests/test_fetchers.py
@@ -0,0 +1,25 @@
+import unittest
+from discogs_client.tests import DiscogsClientTestCase
+from discogs_client.exceptions import HTTPError
+
+class FetcherTestCase(DiscogsClientTestCase):
+    def test_memory_fetcher(self):
+        """Client can fetch responses with MemoryFetcher"""
+        self.m.artist(1)
+
+        with self.assertRaises(HTTPError) as cm:
+            self.m._get('/500')
+
+        self.assertEqual(cm.exception.status_code, 500)
+
+        with self.assertRaises(HTTPError):
+            self.m.release(1).title
+
+        self.assertIsNone(self.m._get('/204'))
+
+
+def suite():
+    suite = unittest.TestSuite()
+    suite = unittest.TestLoader().loadTestsFromTestCase(FetcherTestCase)
+    return suite
+
diff --git a/discogs_client/tests/test_models.py b/discogs_client/tests/test_models.py
new file mode 100644
index 0000000..3da9142
--- /dev/null
+++ b/discogs_client/tests/test_models.py
@@ -0,0 +1,150 @@
+import unittest
+from discogs_client.models import Artist, Release
+from discogs_client.tests import DiscogsClientTestCase
+from discogs_client.exceptions import ConfigurationError, HTTPError
+
+class ModelsTestCase(DiscogsClientTestCase):
+    def test_artist(self):
+        """Artists can be fetched and parsed"""
+        a = self.d.artist(1)
+        self.assertEqual(a.name, 'Persuader, The')
+
+    def test_release(self):
+        """Releases can be fetched and parsed"""
+        r = self.d.release(1)
+        self.assertEqual(r.title, 'Stockholm')
+
+    def test_master(self):
+        """Masters can be fetched and parsed"""
+        m = self.d.master(4242)
+        self.assertEqual(len(m.tracklist), 4)
+
+    def test_user(self):
+        """Users can be fetched and parsed"""
+        u = self.d.user('example')
+        self.assertEqual(u.username, 'example')
+        self.assertEqual(u.name, 'Example Sampleman')
+
+    def test_search(self):
+        results = self.d.search('trash80')
+        self.assertEqual(len(results), 13)
+        self.assertIsInstance(results[0], Artist)
+        self.assertIsInstance(results[1], Release)
+
+    def test_fee(self):
+        fee = self.d.fee_for(20.5, currency='EUR')
+        self.assertEqual(fee.currency, 'USD')
+        self.assertAlmostEqual(fee.value, 1.57)
+
+    def test_invalid_artist(self):
+        """Invalid artist raises HTTPError"""
+        with self.assertRaises(HTTPError):
+            self.d.artist(0).name
+
+    def test_invalid_release(self):
+        """Invalid release raises HTTPError"""
+        with self.assertRaises(HTTPError):
+            self.d.release(0).title
+
+    def test_http_error(self):
+        """HTTPError provides useful information"""
+        with self.assertRaises(HTTPError) as cm:
+            self.d.artist(0).name
+
+        self.assertEqual(cm.exception.status_code, 404)
+        self.assertEqual('404: Resource not found.', str(cm.exception))
+
+    def test_parent_label(self):
+        """Test parent_label / sublabels relationship"""
+        l = self.d.label(1)
+        l2 = self.d.label(31405)
+
+        self.assertIsNone(l.parent_label)
+        self.assertIn(l2, l.sublabels)
+        self.assertEqual(l2.parent_label, l)
+
+    def test_master_versions(self):
+        """Test main_release / versions relationship"""
+        m = self.d.master(4242)
+        r = self.d.release(79)
+        v = m.versions
+
+        self.assertEqual(len(v), 2)
+        self.assertIn(r, v)
+        self.assertEqual(r.master, m)
+
+        r2 = self.d.release(3329867)
+        self.assertIsNone(r2.master)
+
+    def test_user_writable(self):
+        """User profile can be updated"""
+        u = self.d.user('example')
+        u.name # Trigger a fetch
+
+        method, url, data, headers = self.d._fetcher.requests[0]
+        self.assertEqual(method, 'GET')
+        self.assertEqual(url, '/users/example')
+
+        new_home_page = 'http://www.discogs.com'
+        u.home_page = new_home_page
+        self.assertIn('home_page', u.changes)
+        self.assertNotIn('profile', u.changes)
+
+        u.save()
+
+        # Save
+        method, url, data, headers = self.d._fetcher.requests[1]
+        self.assertEqual(method, 'POST')
+        self.assertEqual(url, '/users/example')
+        self.assertEqual(data, {'home_page': new_home_page})
+
+        # Refresh
+        method, url, data, headers = self.d._fetcher.requests[2]
+        self.assertEqual(method, 'GET')
+        self.assertEqual(url, '/users/example')
+
+    def test_wantlist(self):
+        """Wantlists can be manipulated"""
+        # Fetch the user/wantlist from the filesystem
+        u = self.d.user('example')
+        self.assertEqual(len(u.wantlist), 3)
+
+        # Stub out expected responses
+        self.m._fetcher.fetcher.responses = {
+            '/users/example/wants/5': ('{"id": 5}', 201),
+            '/users/example/wants/1': ('', 204),
+        }
+
+        # Now bind the user to the memory client
+        u.client = self.m
+
+        u.wantlist.add(5)
+        method, url, data, headers = self.m._fetcher.last_request
+        self.assertEqual(method, 'PUT')
+        self.assertEqual(url, '/users/example/wants/5')
+
+        u.wantlist.remove(1)
+        method, url, data, headers = self.m._fetcher.last_request
+        self.assertEqual(method, 'DELETE')
+        self.assertEqual(url, '/users/example/wants/1')
+
+    def test_delete_object(self):
+        """Can request DELETE on an APIObject"""
+        u = self.d.user('example')
+        u.delete()
+
+        method, url, data, headers = self.d._fetcher.last_request
+        self.assertEqual(method, 'DELETE')
+        self.assertEqual(url, '/users/example')
+
+    def test_identity(self):
+        """OAuth identity returns a User"""
+        me = self.d.identity()
+        self.assertEqual(me.data['consumer_name'], 'Test Client')
+        self.assertEqual(me, self.d.user('example'))
+
+
+def suite():
+    suite = unittest.TestSuite()
+    suite = unittest.TestLoader().loadTestsFromTestCase(ModelsTestCase)
+    return suite
diff --git a/test_discogs_client.py b/test_discogs_client.py
deleted file mode 100644
index 2a92fec..0000000
--- a/test_discogs_client.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import doctest
-doctest.testfile('README.mkd', optionflags=doctest.ELLIPSIS)

From c721904ea591c138f6a04f8ff9c17ebcf63f96cb Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 16:26:48 -0800
Subject: [PATCH 33/52] Expose more of the OAuth token logic (and update README
 accordingly).

---
 README.mkd                 | 18 ++++++++++--------
 discogs_client/client.py   | 28 +++++++++++++++++++++++-----
 discogs_client/fetchers.py | 10 +++++-----
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/README.mkd b/README.mkd
index f2ce7e9..f821b93 100644
--- a/README.mkd
+++ b/README.mkd
@@ -28,22 +28,24 @@ Install the client from PyPI using your favorite package manager.
 Specify your app's consumer key and secret:
 
     ```python
-    >>> d = discogs_client.Client(
-    ...     'UserAgentString/0.1',
-    ...     'consumer-key-here',
-    ...     'consumer-secret-here'
-    ... )
+    >>> d.set_consumer_key('key-here', 'secret-here')
+    >>> # Or you can do this when you instantiate the Client
     ```
 
 Then go through the OAuth 1.0a process. In a web app, we'd specify a
-`callback_url`; here we'll use the OOB flow.
+`callback_url`. In this example, we'll use the OOB flow.
 
     ```python
     >>> d.get_authorize_url()
-    'http://www.discogs.com/oauth/authorize?...'
+    ('request-token', 'request-secret', 'authorize-url-here')
     ```
     
-Visit the URL, authorize, and get the verifier:
+The client will hang on to the access token and secret, but in a webapp, you'd
+want to persist those and pass them into a new Client instance on the next
+request.
+
+Next, visit the authorize URL, authenticate as a Discogs user, and get the
+verifier:
 
     ```python
     >>> d.get_access_token('verifier-here')
diff --git a/discogs_client/client.py b/discogs_client/client.py
index 501aef3..c31413b 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -14,16 +14,31 @@ class Client(object):
     _authorize_url = 'http://www.discogs.com/oauth/authorize'
     _access_token_url = 'http://api.discogs.com/oauth/access_token'
 
-    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, access_token=None, access_secret=None):
+    def __init__(self, user_agent, consumer_key=None, consumer_secret=None, token=None, secret=None):
+        """An interface to the Discogs API."""
         self.user_agent = user_agent
         self.verbose = False
+        self._fetcher = RequestsFetcher()
 
         if consumer_key and consumer_secret:
-            self._fetcher = OAuth2Fetcher(consumer_key, consumer_secret, access_token, access_secret)
-        else:
-            self._fetcher = RequestsFetcher()
+            self.set_consumer_key(consumer_key, consumer_secret)
+            if token and secret:
+                self.set_token(token, secret)
+
+    def set_consumer_key(self, consumer_key, consumer_secret):
+        self._fetcher = OAuth2Fetcher(consumer_key, consumer_secret)
+
+    def set_token(self, token, secret):
+        try:
+            self._fetcher.store_token(token, secret)
+        except AttributeError:
+            raise ConfigurationError('You must first set the consumer key and secret.')
 
     def get_authorize_url(self, callback_url=None):
+        """
+        Returns a tuple of (<access_token>, <access_secret>, <authorize_url>).
+        Send a Discogs user to the authorize URL to get the verifier for the access token.
+        """
         # Forget existing tokens
         self._fetcher.forget_token()
 
@@ -41,9 +56,12 @@ def get_authorize_url(self, callback_url=None):
         params = {'oauth_token': token}
         query_string = urllib.urlencode(params)
 
-        return '?'.join((self._authorize_url, query_string))
+        return (token, secret, '?'.join((self._authorize_url, query_string)))
 
     def get_access_token(self, verifier):
+        """
+        Uses the verifier to exchange a request token for an access token.
+        """
         self._fetcher.set_verifier(verifier)
 
         content, status_code = self._fetcher.fetch(self, 'POST', self._access_token_url)
diff --git a/discogs_client/fetchers.py b/discogs_client/fetchers.py
index 1fe67f5..297ea2d 100644
--- a/discogs_client/fetchers.py
+++ b/discogs_client/fetchers.py
@@ -40,14 +40,14 @@ def fetch(self, client, method, url, data=None, headers=None, json=True):
 
 class OAuth2Fetcher(Fetcher):
     """Fetches via HTTP + OAuth 1.0a from the Discogs API."""
-    def __init__(self, consumer_key, consumer_secret, access_token=None, access_secret=None):
+    def __init__(self, consumer_key, consumer_secret, token=None, secret=None):
         consumer = oauth2.Consumer(consumer_key, consumer_secret)
-        token = None
+        token_obj = None
 
-        if access_token and access_secret:
-            token = oauth2.Token(access_token, access_secret)
+        if token and secret:
+            token_obj = oauth2.Token(token, secret)
 
-        self.oauth_client = oauth2.Client(consumer, token)
+        self.oauth_client = oauth2.Client(consumer, token_obj)
 
     def store_token_from_qs(self, query_string):
         token_dict = dict(urlparse.parse_qsl(query_string))

From 9bd3384efbb86916296eabc0cfea8982211263b1 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 16:47:06 -0800
Subject: [PATCH 34/52] Add docstrings to Client methods.

---
 discogs_client/client.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index c31413b..59a2fc6 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -118,6 +118,11 @@ def _put(self, url, data):
         return self._request('PUT', url, data)
 
     def search(self, *query, **fields):
+        """
+        Search the Discogs database. Returns a paginated list of objects
+        (Artists, Releases, Masters, and Labels). The keyword arguments to this
+        function are serialized into the request's query string.
+        """
         if query:
             fields['q'] = ' '.join(query)
 
@@ -128,30 +133,39 @@ def search(self, *query, **fields):
         )
 
     def artist(self, id):
+        """Fetch an Artist by ID."""
         return models.Artist(self, {'id': id})
 
     def release(self, id):
+        """Fetch a Release by ID."""
         return models.Release(self, {'id': id})
 
     def master(self, id):
+        """Fetch a Master by ID."""
         return models.Master(self, {'id': id})
 
     def label(self, id):
+        """Fetch a Label by ID."""
         return models.Label(self, {'id': id})
 
     def user(self, username):
+        """Fetch a User by username."""
         return models.User(self, {'username': username})
 
     def listing(self, id):
+        """Fetch a Marketplace Listing by ID."""
         return models.Listing(self, {'id': id})
 
     def order(self, id):
+        """Fetch an Order by ID."""
         return models.Order(self, {'id': id})
 
     def fee_for(self, price, currency='USD'):
+        """Calculate the fee for selling an item on the Marketplace."""
         resp = self._get(self._base_url + '/marketplace/fee/%0.4f/%s' % (float(price), currency))
         return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
 
     def identity(self):
+        """Return a User object representing the OAuth-authorized user."""
         resp = self._get(self._base_url + '/oauth/identity')
         return models.User(self, resp)

From b22a8f19b9f2150ac17c513780c73161091c8ba8 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 16:47:35 -0800
Subject: [PATCH 35/52] Minor tweak to Field for Pythonicness.

---
 discogs_client/models.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index a7e69d7..726c651 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -141,11 +141,7 @@ class Field(object):
     _descriptor_class = None
 
     def __init__(self, *args, **kwargs):
-        self.key = None
-        if 'key' in kwargs:
-            self.key = kwargs['key']
-            del kwargs['key']
-
+        self.key = kwargs.pop('key', None)
         self.args = args
         self.kwargs = kwargs
 

From 2ee4cc4e05e9465ae29a724da21c1c5e298b875e Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 16:55:13 -0800
Subject: [PATCH 36/52] Add stub directories for forthcoming docs and examples.

---
 docs/SOON     | 0
 examples/SOON | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/SOON
 create mode 100644 examples/SOON

diff --git a/docs/SOON b/docs/SOON
new file mode 100644
index 0000000..e69de29
diff --git a/examples/SOON b/examples/SOON
new file mode 100644
index 0000000..e69de29

From 1735421d9f1d3b0fa7baf84ef161e91878d62ba1 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 17:05:27 -0800
Subject: [PATCH 37/52] Reformat README to make GFM happy.

---
 README.mkd | 117 +++++++++++++++++++++++++----------------------------
 1 file changed, 54 insertions(+), 63 deletions(-)

diff --git a/README.mkd b/README.mkd
index f821b93..daebf14 100644
--- a/README.mkd
+++ b/README.mkd
@@ -1,102 +1,93 @@
 # Discogs API Client
 
-This is the official Discogs API client for Python. It enables you to query the
-Discogs database for information on artists, releases, labels, users,
-Marketplace listings, and more. It also supports OAuth 1.0a authorization,
-which allows you to change user data such as profile information, collections
-and wantlists, inventory, and orders.
+This is the official Discogs API client for Python. It enables you to query the Discogs database for information on artists, releases, labels, users, Marketplace listings, and more. It also supports OAuth 1.0a authorization, which allows you to change user data such as profile information, collections and wantlists, inventory, and orders.
 
 ## Installation
 
 Install the client from PyPI using your favorite package manager.
 
-    ```sh
-    $ pip install discogs_client
-    ```
+```sh
+$ pip install discogs_client
+```
 
 ## Quickstart
 
 ### Instantiating the client object
 
-    ```python
-    >>> import discogs_client
-    >>> d = discogs_client.Client('ExampleApplication/0.1')
-    ```
+```python
+>>> import discogs_client
+>>> d = discogs_client.Client('ExampleApplication/0.1')
+```
 
 ### Authorization (optional)
 
 Specify your app's consumer key and secret:
 
-    ```python
-    >>> d.set_consumer_key('key-here', 'secret-here')
-    >>> # Or you can do this when you instantiate the Client
-    ```
+```python
+>>> d.set_consumer_key('key-here', 'secret-here')
+>>> # Or you can do this when you instantiate the Client
+```
 
-Then go through the OAuth 1.0a process. In a web app, we'd specify a
-`callback_url`. In this example, we'll use the OOB flow.
+Then go through the OAuth 1.0a process. In a web app, we'd specify a `callback_url`. In this example, we'll use the OOB flow.
 
-    ```python
-    >>> d.get_authorize_url()
-    ('request-token', 'request-secret', 'authorize-url-here')
-    ```
+```python
+>>> d.get_authorize_url()
+('request-token', 'request-secret', 'authorize-url-here')
+```
     
-The client will hang on to the access token and secret, but in a webapp, you'd
-want to persist those and pass them into a new Client instance on the next
-request.
+The client will hang on to the access token and secret, but in a web app, you'd want to persist those and pass them into a new `Client` instance on the next request.
 
-Next, visit the authorize URL, authenticate as a Discogs user, and get the
-verifier:
+Next, visit the authorize URL, authenticate as a Discogs user, and get the verifier:
 
-    ```python
-    >>> d.get_access_token('verifier-here')
-    ('access-token-here', 'access-secret-here')
-    ```
+```python
+>>> d.get_access_token('verifier-here')
+('access-token-here', 'access-secret-here')
+```
 
 Now you can make requests on behalf of the user.
 
-    ```python
-    >>> me = d.identity()
-    >>> "I'm %s (%s) from %s." % (me.name, me.username, me.location)
-    u"I'm Joe Bloggs (example) from Portland, Oregon."
-    >>> len(me.wantlist)
-    3
-    >>> me.wantlist.add(d.release(5))
-    >>> len(me.wantlist)
-    4
-    ```
+```python
+>>> me = d.identity()
+>>> "I'm %s (%s) from %s." % (me.name, me.username, me.location)
+u"I'm Joe Bloggs (example) from Portland, Oregon."
+>>> len(me.wantlist)
+3
+>>> me.wantlist.add(d.release(5))
+>>> len(me.wantlist)
+4
+```
 
 ### Fetching data
 
 Use methods on the client to fetch objects. You can search for objects:
 
-    ```python
-    >>> results = d.search('Stockholm By Night', type='release')
-    >>> results.pages
-    1
-    >>> artist = results[0].artists[0]
-    >>> artist.name
-    u'Persuader, The'
-    ```
+```python
+>>> results = d.search('Stockholm By Night', type='release')
+>>> results.pages
+1
+>>> artist = results[0].artists[0]
+>>> artist.name
+u'Persuader, The'
+```
 
 Or fetch them by ID:
 
-    ```python
-    >>> artist.id
-    1
-    >>> artist == d.artist(1)
-    True
-    ```
+```python
+>>> artist.id
+1
+>>> artist == d.artist(1)
+True
+```
 
 You can drill down as far as you like.
 
-    ```python
-    >>> releases = d.search('Bit Shifter', type='artist')[0].releases[1].\
-    ...     versions[0].labels[0].releases
-    >>> len(releases)
-    134
-    ```
+```python
+>>> releases = d.search('Bit Shifter', type='artist')[0].releases[1].\
+...     versions[0].labels[0].releases
+>>> len(releases)
+134
+```
 
 ### For more information
 
-Check the included documentation, or just spin up a REPL and use `dir()` on
-things :)
+Check the included documentation, or just spin up a REPL and use `dir()` on things :)

From 18b416cdcfe5593ea757184db9b9542bb52f0d81 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Tue, 10 Jan 2012 17:08:05 -0800
Subject: [PATCH 38/52] Increment year in LICENSE.

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 2cd4afc..d810538 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011 Discogs. All rights reserved.
+Copyright 2012 Discogs. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

From 33dea326737ea690603f54abb80a91a2629087cc Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Wed, 11 Jan 2012 11:10:47 -0800
Subject: [PATCH 39/52] Add items property to Order object.

---
 discogs_client/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 726c651..158698c 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -608,6 +608,7 @@ class Order(PrimaryAPIObject):
     created = SimpleField(transform=parse_timestamp)
     last_activity = SimpleField(transform=parse_timestamp)
     messages = ObjectCollection('OrderMessage', list_class=OrderMessagesList)
+    items = ListField('Listing')
 
     def __init__(self, client, dict_):
         super(Order, self).__init__(client, dict_)

From 28ce74bd6c107b1ce41539a72207911cc848385d Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Wed, 11 Jan 2012 11:13:51 -0800
Subject: [PATCH 40/52] Add .sort() and .filter() methods to paginated
 responses.

---
 discogs_client/models.py | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 158698c..dc7755d 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -267,6 +267,9 @@ def __init__(self, client, url):
         self._pages = {}
         self._per_page = 50
         self._list_key = 'items'
+        self._sort_key = None
+        self._sort_order = 'asc'
+        self._filters = {}
 
     @property
     def per_page(self):
@@ -283,12 +286,39 @@ def _invalidate(self):
         self._num_items = None
 
     def _load_pagination_info(self):
-        data = self.client._get(
-            update_qs(self.url, {'page': 1, 'per_page': self._per_page})
-        )
+        data = self.client._get(self._url_for_page(1))
         self._num_pages = data['pagination']['pages']
         self._num_items = data['pagination']['items']
 
+    def _url_for_page(self, page):
+        base_qs = {
+            'page': page,
+            'per_page': self._per_page,
+        }
+
+        if self._sort_key is not None:
+            base_qs.update({
+                'sort': self._sort_key,
+                'sort_order': self._sort_order,
+            })
+
+        base_qs.update(self._filters)
+
+        return update_qs(self.url, base_qs)
+
+    def sort(self, key, order='asc'):
+        if not order in ('asc', 'desc'):
+            raise ValueError("Order must be one of 'asc', 'desc'")
+        self._sort_key = key
+        self._sort_order = order
+        self._invalidate()
+        return self
+
+    def filter(self, **kwargs):
+        self._filters = kwargs
+        self._invalidate()
+        return self
+
     @property
     def pages(self):
         if self._num_pages is None:
@@ -303,9 +333,7 @@ def count(self):
 
     def page(self, index):
         if not index in self._pages:
-            data = self.client._get(
-                update_qs(self.url, {'page': index, 'per_page': self._per_page})
-            )
+            data = self.client._get(self._url_for_page(index))
             self._pages[index] = [
                 self._transform(item) for item in data[self._list_key]
             ]

From 2af5d804bb7c974e9abeb3ad74e93310e2e07bf9 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 12 Jan 2012 15:35:50 -0800
Subject: [PATCH 41/52] Add url key (which points to HTML representation) for
 models that support it.

---
 discogs_client/models.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index dc7755d..056500b 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -430,6 +430,7 @@ class Artist(PrimaryAPIObject):
     profile = SimpleField()
     data_quality = SimpleField()
     name_variations = SimpleField(key='namevariations')
+    url = SimpleField('uri')
     urls = SimpleField()
     aliases = ListField('Artist')
     members = ListField('Artist')
@@ -458,6 +459,7 @@ class Release(PrimaryAPIObject):
     country = SimpleField()
     notes = SimpleField()
     formats = SimpleField()
+    url = SimpleField('uri')
     videos = ListField('Video')
     tracklist = ListField('Track')
     artists = ListField('Artist')
@@ -488,6 +490,7 @@ class Master(PrimaryAPIObject):
     styles = SimpleField()
     genres = SimpleField()
     images = SimpleField()
+    url = SimpleField('uri')
     videos = ListField('Video')
     tracklist = ListField('Track')
     main_release = ObjectField('Release', as_id=True)
@@ -509,6 +512,7 @@ class Label(PrimaryAPIObject):
     images = SimpleField()
     contact_info = SimpleField()
     data_quality = SimpleField()
+    url = SimpleField('uri')
     sublabels = ListField('Label')
     parent_label = ObjectField('Label', optional=True)
     releases = ObjectCollection('Release')
@@ -530,6 +534,7 @@ class User(PrimaryAPIObject):
     num_lists = SimpleField()
     rank = SimpleField()
     rating_avg = SimpleField()
+    url = SimpleField('uri')
     name = SimpleField(writable=True)
     profile = SimpleField(writable=True)
     location = SimpleField(writable=True)
@@ -611,6 +616,7 @@ class Listing(PrimaryAPIObject):
     ships_from = SimpleField()
     comments = SimpleField()
     audio = SimpleField()
+    url = SimpleField('uri')
     price = ObjectField('Price')
     release = ObjectField('Release')
     seller = ObjectField('User')
@@ -629,6 +635,7 @@ class Order(PrimaryAPIObject):
     next_status = SimpleField()
     shipping_address = SimpleField()
     additional_instructions = SimpleField()
+    url = SimpleField('uri')
     status = SimpleField(writable=True)
     fee = ObjectField('Price')
     buyer = ObjectField('User')

From 444df657280882b3799189ccc338c19ca4bc8b61 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 12 Jan 2012 15:37:15 -0800
Subject: [PATCH 42/52] Add docstring to utils.omit_none.

---
 discogs_client/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/discogs_client/utils.py b/discogs_client/utils.py
index e061d37..0765175 100644
--- a/discogs_client/utils.py
+++ b/discogs_client/utils.py
@@ -14,4 +14,5 @@ def update_qs(url, params):
 
 
 def omit_none(dict_):
+    """Removes any key from a dict that has a value of None."""
     return dict((k, v) for k, v in dict_.iteritems() if v is not None)

From 64d4c9eb2cc2750ed7cddc7219c7dddc2d215f50 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 12 Jan 2012 15:56:52 -0800
Subject: [PATCH 43/52] Add tests for utility functions.

---
 discogs_client/tests/test_utils.py | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 discogs_client/tests/test_utils.py

diff --git a/discogs_client/tests/test_utils.py b/discogs_client/tests/test_utils.py
new file mode 100644
index 0000000..a00da66
--- /dev/null
+++ b/discogs_client/tests/test_utils.py
@@ -0,0 +1,38 @@
+import unittest
+from datetime import datetime
+from discogs_client.tests import DiscogsClientTestCase
+from discogs_client import utils
+
+class UtilsTestCase(DiscogsClientTestCase):
+    def test_update_qs(self):
+        """update_qs helper works as intended"""
+        u = utils.update_qs
+        self.assertEqual(u('http://example.com', {'foo': 'bar'}), 'http://example.com?foo=bar')
+        self.assertEqual(u('http://example.com?foo=bar', {'foo': 'baz'}), 'http://example.com?foo=bar&foo=baz')
+        self.assertEqual(u('http://example.com?c=3&a=yep', {'a': 1, 'b': '1'}), 'http://example.com?c=3&a=yep&a=1&b=1')
+
+    def test_omit_none(self):
+        o = utils.omit_none
+        self.assertEqual(o({
+            'foo': None,
+            'baz': 'bat',
+            'qux': None,
+            'flan': 0,
+        }), {
+            'baz': 'bat',
+            'flan': 0,
+        })
+
+        self.assertEqual(o(dict((k, None) for k in ('qux', 'quux', 'quuux'))), {})
+        self.assertEqual(o({'nope': 'yep'}), {'nope': 'yep'})
+        self.assertEqual(o({}), {})
+
+    def test_parse_timestamp(self):
+        p = utils.parse_timestamp
+        self.assertEqual(p('2012-01-01T00:00:00'), datetime(2012, 1, 1, 0, 0, 0))
+        self.assertEqual(p('2001-05-25T00:00:42'), datetime(2001, 5, 25, 0, 0, 42))
+
+def suite():
+    suite = unittest.TestSuite()
+    suite = unittest.TestLoader().loadTestsFromTestCase(UtilsTestCase)
+    return suite

From 56eb951c5c6bf9e6829b80e963fa9ec9548996de Mon Sep 17 00:00:00 2001
From: Stephane Rufer <stephane@aphrodite.Olympus>
Date: Sun, 3 Jun 2012 13:54:54 +0200
Subject: [PATCH 44/52] fixed setup.py so that the discogs_client package is
 properly built

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 1729b38..8f20a00 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
         name='discogs-client',
-        version='1.1.1',
+        version='2.0',
         description='Official Python API client for Discogs',
         url='https://github.com/discogs/discogs-python-client',
         author='Discogs',
@@ -23,7 +23,7 @@
             'requests',
             'oauth2',
             ],
-        py_modules=[
+        packages=[
             'discogs_client',
             ],
         )

From ed3422f4d82f5be66eee9b106a677e5c2e945b90 Mon Sep 17 00:00:00 2001
From: Rodney Keeling <rodneykeeling@gmail.com>
Date: Tue, 5 Aug 2014 13:30:38 -0700
Subject: [PATCH 45/52] fixing get_authorize_url() method

---
 discogs_client/client.py   | 3 ++-
 discogs_client/fetchers.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index 59a2fc6..af62e7c 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -43,11 +43,12 @@ def get_authorize_url(self, callback_url=None):
         self._fetcher.forget_token()
 
         params = {}
+        params['User-Agent'] = self.user_agent
         if callback_url:
             params['oauth_callback'] = callback_url
         postdata = urllib.urlencode(params)
 
-        content, status_code = self._fetcher.fetch(self, 'POST', self._request_token_url, data=postdata, json=False)
+        content, status_code = self._fetcher.fetch(self, 'POST', self._request_token_url, data=postdata, headers=params)
         if status_code != 200:
             raise HTTPError('Invalid response from request token URL.', status_code)
 
diff --git a/discogs_client/fetchers.py b/discogs_client/fetchers.py
index 297ea2d..4fecc8e 100644
--- a/discogs_client/fetchers.py
+++ b/discogs_client/fetchers.py
@@ -65,9 +65,9 @@ def store_token(self, token, secret):
     def set_verifier(self, verifier):
         self.oauth_client.token.set_verifier(verifier)
 
-    def fetch(self, client, method, url, data=None, headers=None, json=True):
+    def fetch(self, client, method, url, data=None, headers=None, json_format=True):
         if data:
-            body = json.dumps(data) if json else data
+            body = json.dumps(data) if json_format else data
             resp, content = self.oauth_client.request(url, method, body, headers=headers)
         else:
             resp, content = self.oauth_client.request(url, method, headers=headers)

From 1913c8e0967e127d86c2a5adfb25d1a01cbb5946 Mon Sep 17 00:00:00 2001
From: Rodney Keeling <rodneykeeling@gmail.com>
Date: Tue, 5 Aug 2014 13:52:05 -0700
Subject: [PATCH 46/52] adding user-agent header to access token request

---
 discogs_client/client.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/discogs_client/client.py b/discogs_client/client.py
index af62e7c..8d1ddf2 100644
--- a/discogs_client/client.py
+++ b/discogs_client/client.py
@@ -65,7 +65,10 @@ def get_access_token(self, verifier):
         """
         self._fetcher.set_verifier(verifier)
 
-        content, status_code = self._fetcher.fetch(self, 'POST', self._access_token_url)
+        params = {}
+        params['User-Agent'] = self.user_agent
+
+        content, status_code = self._fetcher.fetch(self, 'POST', self._access_token_url, headers=params)
         if status_code != 200:
             raise HTTPError('Invalid response from access token URL.', status_code)
 

From 6fef863ffef80d5d049d4469a886e5d277b5afa5 Mon Sep 17 00:00:00 2001
From: Rodney Keeling <rodneykeeling@gmail.com>
Date: Tue, 19 Aug 2014 10:29:06 -0700
Subject: [PATCH 47/52] updating readme

---
 README.mkd | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/README.mkd b/README.mkd
index daebf14..fe50801 100644
--- a/README.mkd
+++ b/README.mkd
@@ -88,6 +88,120 @@ You can drill down as far as you like.
 134
 ```
 
+## Artist
+
+Query for an artist using the artist's name:
+
+    >>> artist = d.artist(956139)
+    >>> print artist
+    <Artist "...">
+    >>> 'name' in artist.data.keys()
+    True
+
+### Special properties
+
+Get a list of `Artist`s representing this artist's aliases:
+
+    >>> artist.aliases
+    [...]
+
+Get a list of `Release`s by this artist by page number:
+
+    >>> artist.releases.page(1)
+    [...]
+
+## Release
+
+Query for a release using its Discogs ID:
+
+    >>> release = d.release(221824)
+
+### Special properties
+
+Get the title of this `Release`:
+
+    >>> release.title
+    u'...'
+
+Get a list of all `Artist`s associated with this `Release`:
+
+    >>> release.artists
+    [<Artist "...">]
+
+Get the tracklist for this `Release`:
+
+    >>> release.tracklist
+    [...]
+
+Get the `MasterRelease` for this `Release`:
+
+    >>> release.master
+    <MasterRelease "...">
+
+Get a list of all `Label`s for this `Release`:
+
+    >>> release.labels
+    [...]
+
+## MasterRelease
+
+Query for a master release using its Discogs ID:
+
+    >>> master_release = d.master(120735)
+
+### Special properties
+
+Get the key `Release` for this `MasterRelease`:
+
+    >>> master_release.main_release
+    <Release "...">
+
+Get the title of this `MasterRelease`:
+
+    >>> master_release.title
+    u'...'
+    >>> master_release.title == master_release.main_release.title
+    True
+
+Get a list of `Release`s representing other versions of this `MasterRelease` by page number:
+
+    >>> master_release.versions.page(1)
+    [...]
+
+Get the tracklist for this `MasterRelease`:
+
+    >>> master_release.tracklist
+    [...]
+
+## Label
+
+Query for a label using the label's name:
+
+    >>> label = d.label(6170)
+
+### Special properties
+
+Get a list of `Release`s from this `Label` by page number:
+
+    >>> label.releases.page(1)
+    [...]
+
+Get a list of `Label`s representing sublabels associated with this `Label`:
+
+    >>> label.sublabels
+    [...]
+
+Get the `Label`'s parent label, if it exists:
+
+    >>> label.parent_label
+    <Label "Warp Records Limited">
+
+
+## Contributing
+1. Fork this repo
+2. Create a feature branch
+3. Open a pull-request
+
 ### For more information
 
 Check the included documentation, or just spin up a REPL and use `dir()` on things :)

From a60129fa56b6dbd569fcb559e3a262061543ba45 Mon Sep 17 00:00:00 2001
From: Rodney Keeling <rodneykeeling@gmail.com>
Date: Tue, 19 Aug 2014 12:01:34 -0700
Subject: [PATCH 48/52] adding artist images field

---
 discogs_client/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/discogs_client/models.py b/discogs_client/models.py
index 056500b..1adeb1a 100644
--- a/discogs_client/models.py
+++ b/discogs_client/models.py
@@ -427,6 +427,7 @@ class Artist(PrimaryAPIObject):
     id = SimpleField()
     name = SimpleField()
     real_name = SimpleField(key='realname')
+    images = SimpleField()
     profile = SimpleField()
     data_quality = SimpleField()
     name_variations = SimpleField(key='namevariations')

From 4e86eb28b4866a9a8fd925b8eb46a93fbf4d6e9a Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 21 Aug 2014 10:40:46 -0700
Subject: [PATCH 49/52] Update .travis.yml to use nose

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 92ed351..c06f09e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,6 @@ python:
 install:
     - pip install -r requirements.txt --use-mirrors
 script:
-    - coverage run tests.py
+    - nosetests --with-coverage
 after_success:
     - coveralls

From f8ecd7b85f1ee053790362937273f8e43fa66992 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 21 Aug 2014 10:45:30 -0700
Subject: [PATCH 50/52] Add oauth2 to requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 4e96e39..0dbb724 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,5 @@ coverage==3.6
 coveralls==0.2
 docopt==0.6.1
 requests==1.2.3
+oauth2==1.5.211
 sh==1.08

From 83e01a3b99237980e2d710b3bf8be7fb4dda246b Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 21 Aug 2014 11:10:19 -0700
Subject: [PATCH 51/52] Make tests Python 2.6 compatible

---
 discogs_client/tests/test_core.py     | 35 ++++++++++++++++-----------
 discogs_client/tests/test_fetchers.py | 14 +++++------
 discogs_client/tests/test_models.py   | 32 ++++++++++++------------
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/discogs_client/tests/test_core.py b/discogs_client/tests/test_core.py
index 1eab471..b6d2ee5 100644
--- a/discogs_client/tests/test_core.py
+++ b/discogs_client/tests/test_core.py
@@ -10,17 +10,20 @@ def test_user_agent(self):
         self.d.artist(1).name
 
         bad_client = Client('')
-        with self.assertRaises(ConfigurationError) as cm:
-            bad_client.artist(1).name
 
-        self.assertIn('User-Agent', str(cm.exception))
+        self.assertRaises(ConfigurationError, lambda: bad_client.artist(1).name)
+
+        try:
+            bad_client.artist(1).name
+        except ConfigurationError as e:
+            self.assertTrue('User-Agent' in str(e))
 
     def test_caching(self):
         """Only perform a fetch when requesting missing data"""
         a = self.d.artist(1)
 
         self.assertEqual(a.id, 1)
-        self.assertIsNone(self.d._fetcher.last_request)
+        self.assertTrue(self.d._fetcher.last_request is None)
 
         self.assertEqual(a.name, 'Persuader, The')
         self.assertGot('/artists/1')
@@ -31,7 +34,7 @@ def test_caching(self):
         # Get a key that's not in our cache
         a.fetch('blorf')
         self.assertEqual(len(self.d._fetcher.requests), 2)
-        self.assertIn('blorf', a._known_invalid_keys)
+        self.assertTrue('blorf' in a._known_invalid_keys)
 
         # Now we know artists don't have blorves
         a.fetch('blorf')
@@ -53,7 +56,7 @@ def test_equality(self):
     def test_transform_datetime(self):
         """String timestamps are converted to datetimes"""
         registered = self.d.user('example').registered
-        self.assertIsInstance(registered, datetime)
+        self.assertTrue(isinstance(registered, datetime))
 
     def test_object_field(self):
         """APIObjects can have APIObjects as properties"""
@@ -62,14 +65,16 @@ def test_object_field(self):
     def test_read_only_simple_field(self):
         """Can't write to a SimpleField when writable=False"""
         u = self.d.user('example')
-        with self.assertRaises(AttributeError):
+        def fail():
             u.rank = 9001
+        self.assertRaises(AttributeError, fail)
 
     def test_read_only_object_field(self):
         """Can't write to an ObjectField"""
         m = self.d.master(4242)
-        with self.assertRaises(AttributeError):
+        def fail():
             m.main_release = 'lol!'
+        self.assertRaises(AttributeError, fail)
 
     def test_pagination(self):
         """PaginatedLists are parsed correctly, indexable, and iterable"""
@@ -82,19 +87,21 @@ def test_pagination(self):
         self.assertEqual(len(results), 57)
         self.assertEqual(len(results.page(1)), 50)
 
-        with self.assertRaises(HTTPError) as cm:
+        self.assertRaises(HTTPError, lambda: results.page(42))
+
+        try:
             results.page(42)
-        self.assertEqual(cm.exception.status_code, 404)
+        except HTTPError as e:
+            self.assertEqual(e.status_code, 404)
 
-        with self.assertRaises(IndexError):
-            results[3141592]
+        self.assertRaises(IndexError, lambda: results[3141592])
 
         self.assertEqual(results[0].id, 20209)
-        self.assertIn(self.d.release(20209), results)
+        self.assertTrue(self.d.release(20209) in results)
 
         # Changing pagination settings invalidates the cache
         results.per_page = 10
-        self.assertIsNone(results._num_pages)
+        self.assertTrue(results._num_pages is None)
 
 def suite():
     suite = unittest.TestSuite()
diff --git a/discogs_client/tests/test_fetchers.py b/discogs_client/tests/test_fetchers.py
index 8cb3e3c..5b1bb6b 100644
--- a/discogs_client/tests/test_fetchers.py
+++ b/discogs_client/tests/test_fetchers.py
@@ -7,15 +7,15 @@ def test_memory_fetcher(self):
         """Client can fetch responses with MemoryFetcher"""
         self.m.artist(1)
 
-        with self.assertRaises(HTTPError) as cm:
-            self.m._get('/500')
-
-        self.assertEqual(cm.exception.status_code, 500)
+        self.assertRaises(HTTPError, lambda: self.m._get('/500'))
 
-        with self.assertRaises(HTTPError):
-            self.m.release(1).title
+        try:
+            self.m._get('/500')
+        except HTTPError as e:
+            self.assertEqual(e.status_code, 500)
 
-        self.assertIsNone(self.m._get('/204'))
+        self.assertRaises(HTTPError, lambda: self.m.release(1).title)
+        self.assertTrue(self.m._get('/204') is None)
 
 
 def suite():
diff --git a/discogs_client/tests/test_models.py b/discogs_client/tests/test_models.py
index 3da9142..3c6b3ad 100644
--- a/discogs_client/tests/test_models.py
+++ b/discogs_client/tests/test_models.py
@@ -28,8 +28,8 @@ def test_user(self):
     def test_search(self):
         results = self.d.search('trash80')
         self.assertEqual(len(results), 13)
-        self.assertIsInstance(results[0], Artist)
-        self.assertIsInstance(results[1], Release)
+        self.assertTrue(isinstance(results[0], Artist))
+        self.assertTrue(isinstance(results[1], Release))
 
     def test_fee(self):
         fee = self.d.fee_for(20.5, currency='EUR')
@@ -38,29 +38,29 @@ def test_fee(self):
 
     def test_invalid_artist(self):
         """Invalid artist raises HTTPError"""
-        with self.assertRaises(HTTPError):
-            self.d.artist(0).name
+        self.assertRaises(HTTPError, lambda: self.d.artist(0).name)
 
     def test_invalid_release(self):
         """Invalid release raises HTTPError"""
-        with self.assertRaises(HTTPError):
-            self.d.release(0).title
+        self.assertRaises(HTTPError, lambda: self.d.release(0).title)
 
     def test_http_error(self):
         """HTTPError provides useful information"""
-        with self.assertRaises(HTTPError) as cm:
-            self.d.artist(0).name
+        self.assertRaises(HTTPError, lambda: self.d.artist(0).name)
 
-        self.assertEqual(cm.exception.status_code, 404)
-        self.assertEqual('404: Resource not found.', str(cm.exception))
+        try:
+            self.d.artist(0).name
+        except HTTPError as e:
+            self.assertEqual(e.status_code, 404)
+            self.assertEqual('404: Resource not found.', str(e))
 
     def test_parent_label(self):
         """Test parent_label / sublabels relationship"""
         l = self.d.label(1)
         l2 = self.d.label(31405)
 
-        self.assertIsNone(l.parent_label)
-        self.assertIn(l2, l.sublabels)
+        self.assertTrue(l.parent_label is None)
+        self.assertTrue(l2 in l.sublabels)
         self.assertEqual(l2.parent_label, l)
 
     def test_master_versions(self):
@@ -70,11 +70,11 @@ def test_master_versions(self):
         v = m.versions
 
         self.assertEqual(len(v), 2)
-        self.assertIn(r, v)
+        self.assertTrue(r in v)
         self.assertEqual(r.master, m)
 
         r2 = self.d.release(3329867)
-        self.assertIsNone(r2.master)
+        self.assertTrue(r2.master is None)
 
     def test_user_writable(self):
         """User profile can be updated"""
@@ -87,8 +87,8 @@ def test_user_writable(self):
 
         new_home_page = 'http://www.discogs.com'
         u.home_page = new_home_page
-        self.assertIn('home_page', u.changes)
-        self.assertNotIn('profile', u.changes)
+        self.assertTrue('home_page' in u.changes)
+        self.assertFalse('profile' in u.changes)
 
         u.save()
 

From b094fd11f161463dc3354d2987d17c7b11416f19 Mon Sep 17 00:00:00 2001
From: Jesse Dubay <jesse@thefortytwo.net>
Date: Thu, 21 Aug 2014 11:14:14 -0700
Subject: [PATCH 52/52] Only run coverage over discogs_client package

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c06f09e..09c04e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,6 @@ python:
 install:
     - pip install -r requirements.txt --use-mirrors
 script:
-    - nosetests --with-coverage
+    - nosetests --with-coverage --cover-package=discogs_client
 after_success:
     - coveralls