Moved util module into main package

CHANGES.txt

@@ -3,4 +3,5 @@ v1.42, June 19, 2014 -- Removed dependency on simplejson
 v1.43, June 27, 2014 -- Fixed JSON handling issue
 v1.44, July 3, 2014 -- Added show_tracks.py exampole
 v1.45, July 7, 2014 -- Support for related artists endpoint. Don't used cache auth codes when scope changes
+v1.50, August 14, 2014 -- Refactored util out of examples and into the main package
 

examples/add_a_saved_track.py

@@ -6,7 +6,7 @@ import sys
 
 import spotipy
 import spotipy.oauth2 as oauth2
-import util
+import spotipy.util as util
 
 scope = 'user-library-modify'
 

examples/add_tracks_to_playlist.py

@@ -6,7 +6,7 @@ import sys
 
 import spotipy
 import spotipy.oauth2 as oauth2
-import util
+import spotipy.util as util
 
 if len(sys.argv) > 3:
     username = sys.argv[1]

examples/create_playlist.py

@@ -7,8 +7,8 @@ import subprocess
 
 import spotipy
 
-import util
 import spotipy.oauth2 as oauth2
+import spotipy.util as util
 
 
 if len(sys.argv) > 2:

examples/delete_a_saved_track.py

@@ -5,7 +5,7 @@ import sys
 
 import spotipy
 import spotipy.oauth2 as oauth2
-import util
+import spotipy.util as util
 
 scope = 'user-library-modify'
 

examples/show_my_saved_tracks.py

@@ -6,7 +6,7 @@ import sys
 
 import spotipy
 import spotipy.oauth2 as oauth2
-import util
+import spotipy.util as util
 
 scope = 'user-library-read'
 

examples/user_playlists.py

@@ -7,9 +7,8 @@ import subprocess
 
 import spotipy
 
-import util
 import spotipy.oauth2 as oauth2
-
+import spotipy.util as util
 
 
 if len(sys.argv) > 1:

examples/user_playlists_contents.py

@@ -6,9 +6,8 @@ import os
 import subprocess
 
 import spotipy
-
-import util
 import spotipy.oauth2 as oauth2
+import spotipy.util as util
 
 
 def show_tracks(results):

examples/user_starred_playlist.py

@@ -2,7 +2,7 @@
 
 import sys
 import spotipy
-import util
+import spotipy.util as util
 import spotipy.oauth2 as oauth2
 
 

setup.py

@@ -3,11 +3,11 @@ from setuptools import setup
 
 setup(
     name='SpotipyWebApi',
-    version='1.49',
+    version='1.50',
     description='simple client for the Spotify Web API',
     author="@plamere",
     author_email="paul@echonest.com",
     url='http://github.com/plamere/spotipy',
     install_requires=['requests>=1.0'],
     license='LICENSE.txt',
-    py_modules=['spotipy', 'spotipy.oauth2'],)
+    py_modules=['spotipy', 'spotipy.oauth2', 'spotipy.util'],)

spotipy/util.py

@@ -4,7 +4,7 @@
 import os
 import subprocess
 import sys
-import spotipy.oauth2 as oauth2
+import oauth2
 
 def prompt_for_user_token(username, scope=None):
     ''' prompts the user to login if necessary and returns