Fix support for Python 3.6.

README.rst

@@ -3,7 +3,7 @@ Synology PhotoStation Python API
 
 A Python API to communicate with `Photo Station <https://www.synology.com/en-global/dsm/6.1/packages/PhotoStation>`_ running on Synology NAS. Photos and videos are uploaded directly to PhotoStation through its Web API with various metadata including ratings, title, description, and GPS coordinates.
 
-This module uploads only original files and lets Synology to process the required thumbnail versions. This works fine with Synology DS916+ but might be too slow with models having slower processors.
+This module uploads original files and lets Synology to process the required thumbnail versions. This works fine with Synology DS916+ but might be too slow with models having slower processors.
 
 Supported features:
 

photostation/__init__.py

@@ -1,2 +1,2 @@
-from photostation import PhotoStationService
-from error import SynologyException
+from photostation.service import PhotoStationService
+from photostation.error import SynologyException

photostation/error.py

@@ -49,4 +49,4 @@ def __init__(self, code):
         if code in self.API_ERROR:
             self.value = self.API_ERROR[code]
         else:
-            self.value = 'Unknown error from API (%d)' % code
+            self.value = code

photostation/photostation.py → photostation/service.py

@@ -2,9 +2,9 @@
 import time
 import io
 from requests_toolbelt.downloadutils import stream
-from session import SynologyAuthSession
-from utils import PhotoStationUtils
-from error import SynologyException
+from photostation.session import SynologyAuthSession
+from photostation.utils import PhotoStationUtils
+from photostation.error import SynologyException
 from pprint import pprint, pformat
 
 class PhotoStationService(object):

photostation/session.py

@@ -3,9 +3,12 @@
 import os
 import pickle
 import time
-from urlparse import urlparse
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    from urlparse import urlparse
 from pprint import pprint, pformat
-from error import SynologyException
+from photostation.error import SynologyException
 
 class SynologySession(object):
 

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='photostation',
-    version='0.1.4',
+    version='0.1.5',
     description='A Python API to communicate with Photo Station running on Synology NAS.',
     long_description=long_description,
     url='https://github.com/skarppi/python-photostation',
@@ -30,6 +30,8 @@
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     keywords='synology dsm photo station web api',