From 63ec5c603ef5b016805b9cf542a88e63e795d616 Mon Sep 17 00:00:00 2001
From: Simon Weber <simon@simonmweber.com>
Date: Tue, 12 Feb 2013 13:04:48 -0500
Subject: [PATCH 1/2] fix packaging issues

---
 .gitignore                            | 2 +-
 MANIFEST.in                           | 2 +-
 gmusicapi/__init__.py                 | 2 +-
 gmusicapi/{version.py => _version.py} | 0
 gmusicapi/protocol/webclient.py       | 6 +++---
 setup.py                              | 5 ++---
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename gmusicapi/{version.py => _version.py} (100%)

diff --git a/.gitignore b/.gitignore
index 24fd75a7..e95b33c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ Thumbs.db
 .*.swo
 *.tmproj
 
-_*.py
+_local_*.py
 *.pyc
 
 docs/build
diff --git a/MANIFEST.in b/MANIFEST.in
index 1b7f316e..0e326ebc 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,4 +3,4 @@ recursive-include gmusicapi *.py
 include docs/Makefile
 recursive-include docs/source *.py *.rst
 include gmusicapi/test/audiotest*
-global-exclude _*.py
+global-exclude _local_*.py
diff --git a/gmusicapi/__init__.py b/gmusicapi/__init__.py
index cb50b25b..f1036cb6 100644
--- a/gmusicapi/__init__.py
+++ b/gmusicapi/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from version import __version__
+from _version import __version__
 
 __copyright__ = 'Copyright 2013 Simon Weber'
 __license__ = 'BSD 3-Clause'
diff --git a/gmusicapi/version.py b/gmusicapi/_version.py
similarity index 100%
rename from gmusicapi/version.py
rename to gmusicapi/_version.py
diff --git a/gmusicapi/protocol/webclient.py b/gmusicapi/protocol/webclient.py
index c042fa4a..bfe11e65 100644
--- a/gmusicapi/protocol/webclient.py
+++ b/gmusicapi/protocol/webclient.py
@@ -80,9 +80,9 @@ def check_success(cls, res):
         if 'success' in res and not res['success']:
             raise CallFailure(
                 "the server reported failure. This is usually"
-                "caused by bad arguments, but can also happen if requests"
-                "are made too quickly (eg creating a playlist then"
-                "modifying it before the server has created it)",
+                " caused by bad arguments, but can also happen if requests"
+                " are made too quickly (eg creating a playlist then"
+                " modifying it before the server has created it)",
                 cls.__name__)
 
     @classmethod
diff --git a/setup.py b/setup.py
index 2036299a..1968ac8d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,13 @@
 #!/usr/bin/env python
 
-from distutils.core import setup
-from setuptools import find_packages
+from setuptools import setup, find_packages
 import re
 
 #This hack is from http://stackoverflow.com/a/7071358/1231454;
 # the version is kept in a seperate file and gets parsed - this
 # way, setup.py doesn't have to import the package.
 
-VERSIONFILE = 'gmusicapi/version.py'
+VERSIONFILE = 'gmusicapi/_version.py'
 
 version_line = open(VERSIONFILE).read()
 version_re = r"^__version__ = ['\"]([^'\"]*)['\"]"

From 52155e92444ddbe41cb79545f3f3143277bb6c42 Mon Sep 17 00:00:00 2001
From: Simon Weber <simon@simonmweber.com>
Date: Tue, 12 Feb 2013 13:25:28 -0500
Subject: [PATCH 2/2] release 2013.02.12 to fix packaging issues

---
 gmusicapi/_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gmusicapi/_version.py b/gmusicapi/_version.py
index 0d3bdfda..7a964d70 100644
--- a/gmusicapi/_version.py
+++ b/gmusicapi/_version.py
@@ -1 +1 @@
-__version__ = "2013.02.11"
+__version__ = "2013.02.12"