Merge f9c0c331a0 into b30839a26f

.gitignore

@@ -0,0 +1 @@
+*.pyc

Readme.md

@@ -0,0 +1,7 @@
+# python-lastfm
+
+This package provides a python interface to the [last.fm web services API](http://ws.audioscrobbler.com/2.0/) ([Docs](http://www.last.fm/api/intro)).
+
+The package covers all the methods provided by the web service API. It also contains some composite methods built upon the methods provided by the web service API. Authentication and authenticated methods are supported.
+
+The code is being documented now. You can see the documentation [here](http://abhinavsarkar.net/python-lastfm-apidocs/) for reference. 

setup.py

@@ -15,7 +15,7 @@ located at http://ws.audioscrobbler.com/2.0/ .""",
 	maintainer="Abhinav Sarkar",
 	maintainer_email="abhinav.sarkar@gmail.com",
 	url="http://python-lastfm.googlecode.com/svn/trunk/dist/",
-	packages=['lastfm'],
+	packages=['lastfm', 'lastfm.mixin', 'lastfm.util'],
     package_data = {'doc':['*.txt', '*.htm', '*.css', '*.js', '*.png']},
 	license="GNU Lesser General Public License",
 	keywords="audioscrobbler webservice api last.fm",
@@ -24,7 +24,7 @@ located at http://ws.audioscrobbler.com/2.0/ .""",
 SETUPTOOLS_METADATA = dict(
 	install_requires = ['setuptools', 'decorator'],
 	include_package_data = True,
-    tests_require = ['wsgi_intercept'],
+    tests_require = ['wsgi_intercept >= 0.8.1'],
 	classifiers = [
 		'Development Status :: 3 - Alpha',
 		'Intended Audience :: Developers',

test/test_album.py

@@ -8,7 +8,7 @@ import unittest
 import datetime
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_artist.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_event.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_geo.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_group.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_playlist.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_tag.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_track.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_user.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app
 

test/test_venue.py

@@ -7,7 +7,7 @@ __license__ = "GNU Lesser General Public License"
 import unittest
 import sys, os
 
-from wsgi_intercept.urllib2_intercept import install_opener
+from wsgi_intercept.urllib_intercept import install_opener
 import wsgi_intercept
 from wsgi_test_app import create_wsgi_app