Merge pull request cbick#1 from bartvanandel/2to3

Add support for Python 3

setup.py

@@ -2,11 +2,33 @@
 
 setup(
     name='osmviz',
-    version='1.0',
+    version='1.0.1',
+    description='OSMViz is a small set of Python tools for retrieving '
+                'and using Mapnik tiles from a Slippy Map server '
+                '(you may know these as OpenStreetMap images).',
     long_description=open('README.md', 'r').read(),
-    packages=find_packages('src'),
+    classifiers=[
+        # 'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Software Development :: Documentation'],
+    keywords='osm openstreetmap tiles visualization',
+    author='Colin Bick',
+    author_email='[email protected]',
+    url='http://cbick.github.com/osmviz',
+    license='MIT',
     package_dir={'': 'src'},
-    zip_safe=False,
+    packages=find_packages(where='src'),
+    include_package_data=True,
+    use_2to3=True,
+    # osmviz actually only requires either PyGame or PIL, not necessarily both
     requires=(
        'PyGame',
        'PIL',

src/osmviz/manager.py

@@ -230,7 +230,7 @@ def __init__(self, **kwargs):
 
         # Make a hash of the server URL to use in cached tile filenames.
         md5 = hashlib.md5()
-        md5.update(self.server)
+        md5.update(self.server.encode("utf-8"))
         self.cache_prefix = 'osmviz-%s-' % md5.hexdigest()[:5]
 
         if mgr:  # Assume it's a valid manager