Merge branch 'develop' into various-additions

Conflicts:
	docs/changes.rst

docs/changes.rst

@@ -53,6 +53,12 @@ v1.7 (in development)
 
 - Added optional argurment ``type`` for :class:`spotify.ArtistBrowser`.
 
+**Other changes**
+
+- For developers: *pyspotify* now uses `libmockspotify
+  <https://github.com/mopidy/libmockspotify>`_ for its mocking needs. The
+  mock module only contains Python bindings to the *libmockspotify* API.
+
 v1.6.1 (2011-12-29)
 ===================
 

setup.py

@@ -85,6 +85,7 @@ def fullsplit(path, result=None):
         'src/toplistbrowser.c',
     ],
     include_dirs=['src'],
+    libraries=['mockspotify'],
 )
 
 setup(

src/albumbrowser.c

@@ -7,7 +7,7 @@
 #include "track.h"
 #include "session.h"
 
-static PyObject *
+PyObject *
 AlbumBrowser_FromSpotify(sp_albumbrowse * browse)
 {
     AlbumBrowser *b = (AlbumBrowser *)AlbumBrowserType.tp_alloc(&AlbumBrowserType, 0);

src/albumbrowser.h

@@ -8,3 +8,6 @@ typedef struct {
 extern PyTypeObject AlbumBrowserType;
 
 extern void albumbrowser_init(PyObject *m);
+
+PyObject *
+AlbumBrowser_FromSpotify(sp_albumbrowse *browse);

src/artistbrowser.c

@@ -8,7 +8,7 @@
 #include "session.h"
 #include "track.h"
 
-static PyObject *
+PyObject *
 ArtistBrowser_FromSpotify(sp_artistbrowse * browse)
 {
     ArtistBrowser *b = (ArtistBrowser *)ArtistBrowserType.tp_alloc(&ArtistBrowserType, 0);

src/artistbrowser.h

@@ -8,3 +8,6 @@ typedef struct {
 extern PyTypeObject ArtistBrowserType;
 
 extern void artistbrowser_init(PyObject *m);
+
+PyObject *
+ArtistBrowser_FromSpotify(sp_artistbrowse * browse);