[mapproxy] 01/04: Imported Upstream version 1.10.1

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapproxy.

commit 7469325e6c2e38ec73a8bb6cf508e11b29b00f35
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 6 14:19:39 2017 +0200

    Imported Upstream version 1.10.1
---
 CHANGES.txt                  |  9 +++++++++
 doc/conf.py                  |  2 +-
 mapproxy/compat/itertools.py |  2 ++
 mapproxy/util/ext/serving.py | 38 +++-----------------------------------
 mapproxy/util/geom.py        |  6 ++++--
 setup.py                     |  2 +-
 6 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 88b1fa3..d09e704 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+1.10.1 2017-06-06
+~~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Fix mapproxy-util serve-develop for Python 3.6 on Windows
+- Fix OGR coverages on Windows with Python 3 and official OGR Python bindings
+- Fix --repeat option of mapproxy-util scales
+
 1.10.0 2017-05-18
 ~~~~~~~~~~~~~~~~~
 
diff --git a/doc/conf.py b/doc/conf.py
index e09cca4..335a1d3 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'Oliver Tonnhofer, Omniscale'
 # The short X.Y version.
 version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.0a0'
+release = '1.10.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/mapproxy/compat/itertools.py b/mapproxy/compat/itertools.py
index 5e26a64..de647d3 100644
--- a/mapproxy/compat/itertools.py
+++ b/mapproxy/compat/itertools.py
@@ -13,6 +13,7 @@ if PY2:
         islice,
         chain,
         groupby,
+        cycle,
     )
 
 else:
@@ -23,5 +24,6 @@ else:
         islice,
         chain,
         groupby,
+        cycle,
     )
 
diff --git a/mapproxy/util/ext/serving.py b/mapproxy/util/ext/serving.py
index d78a2e3..50a8d3d 100644
--- a/mapproxy/util/ext/serving.py
+++ b/mapproxy/util/ext/serving.py
@@ -50,10 +50,10 @@ except ImportError:
     import _thread as thread
 
 try:
-    from SocketServer import ThreadingMixIn, ForkingMixIn
+    from SocketServer import ThreadingMixIn
     from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 except ImportError:
-    from socketserver import ThreadingMixIn, ForkingMixIn
+    from socketserver import ThreadingMixIn
     from http.server import HTTPServer, BaseHTTPRequestHandler
 
 from mapproxy.compat import iteritems, PY2, text_type
@@ -472,37 +472,6 @@ class ThreadedWSGIServer(ThreadingMixIn, BaseWSGIServer):
     multithread = True
 
 
-class ForkingWSGIServer(ForkingMixIn, BaseWSGIServer):
-    """A WSGI server that does forking."""
-    multiprocess = True
-
-    def __init__(self, host, port, app, processes=40, handler=None,
-                 passthrough_errors=False, ssl_context=None):
-        BaseWSGIServer.__init__(self, host, port, app, handler,
-                                passthrough_errors, ssl_context)
-        self.max_children = processes
-
-
-def make_server(host, port, app=None, threaded=False, processes=1,
-                request_handler=None, passthrough_errors=False,
-                ssl_context=None):
-    """Create a new server instance that is either threaded, or forks
-    or just processes one request after another.
-    """
-    if threaded and processes > 1:
-        raise ValueError("cannot have a multithreaded and "
-                         "multi process server.")
-    elif threaded:
-        return ThreadedWSGIServer(host, port, app, request_handler,
-                                  passthrough_errors, ssl_context)
-    elif processes > 1:
-        return ForkingWSGIServer(host, port, app, processes, request_handler,
-                                 passthrough_errors, ssl_context)
-    else:
-        return BaseWSGIServer(host, port, app, request_handler,
-                              passthrough_errors, ssl_context)
-
-
 def _iter_module_files():
     # The list call is necessary on Python 3 in case the module
     # dictionary modifies during iteration.
@@ -715,8 +684,7 @@ def run_simple(hostname, port, application, use_reloader=False,
         application = SharedDataMiddleware(application, static_files)
 
     def inner():
-        make_server(hostname, port, application, threaded,
-                    processes, request_handler,
+        ThreadedWSGIServer(hostname, port, application, request_handler,
                     passthrough_errors, ssl_context).serve_forever()
 
     if os.environ.get('WERKZEUG_RUN_MAIN') != 'true':
diff --git a/mapproxy/util/geom.py b/mapproxy/util/geom.py
index 6a0c1a6..f6e8c8d 100644
--- a/mapproxy/util/geom.py
+++ b/mapproxy/util/geom.py
@@ -22,7 +22,7 @@ from functools import partial
 from contextlib import closing
 
 from mapproxy.grid import tile_grid
-from mapproxy.compat import string_type
+from mapproxy.compat import string_type, text_type
 
 import logging
 log_config = logging.getLogger('mapproxy.config.coverage')
@@ -81,8 +81,10 @@ def load_ogr_datasource(datasource, where=None):
     try:
         with closing(OGRShapeReader(datasource)) as reader:
             for wkt in reader.wkts(where):
+                if not isinstance(wkt, text_type):
+                    wkt = wkt.decode()
                 try:
-                    geom = shapely.wkt.loads(wkt.decode())
+                    geom = shapely.wkt.loads(wkt)
                 except ReadingError as ex:
                     raise GeometryError(ex)
                 if geom.type == 'Polygon':
diff --git a/setup.py b/setup.py
index 227870e..80b9c5a 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="1.10.0a0",
+    version="1.10.1",
     description='An accelerating proxy for web map services',
     long_description=long_description(7),
     author='Oliver Tonnhofer',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapproxy.git