MapProxy 7.0.0__tar.gz → 8.0.0__tar.gz

{mapproxy-7.0.0 → mapproxy-8.0.0}/CHANGES.txt

@@ -1,3 +1,27 @@
+8.0.0 2026-11-02
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Drop support for Python 3.10, 3.11, 3.12 and 3.13. MapProxy now requires Python 3.14
+
+Improvements:
+
+  - Add support for Python 3.15
+
+Maintenance:
+
+  - Raise minimal Pillow version to 13.0.0 because of security fixes
+  - Remove compatibility code for old Pillow versions
+  - Convert ``I`` mode images to 16bit before writing PNG, as Pillow 13 no longer does this implicitly.
+    The output is unchanged
+
+Fixes:
+
+  - Fix decorate_img example in the documentation
+  - Fix MBTiles cache on Python 3.15, sqlite3.connect no longer accepts a positional timeout
+
+
 7.0.0 2026-07-17
 ~~~~~~~~~~~~~~~~
 

{mapproxy-7.0.0 → mapproxy-8.0.0}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 7.0.0
+Version: 8.0.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -12,14 +12,12 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
+Requires-Python: >=3.14
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: COPYING.txt
@@ -29,10 +27,7 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow>=9; python_version == "3.10"
-Requires-Dist: Pillow>=10; python_version == "3.11"
-Requires-Dist: Pillow>=10.1; python_version == "3.12"
-Requires-Dist: Pillow>=11; python_version >= "3.13"
+Requires-Dist: Pillow>=13.0.0
 Requires-Dist: lxml>=6
 Requires-Dist: shapely>=2
 Requires-Dist: jinja2
@@ -51,6 +46,7 @@ Dynamic: license-file
 Dynamic: maintainer
 Dynamic: maintainer-email
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 MapProxy is an open source proxy for geospatial data. It caches, accelerates and transforms data from existing map services and serves any desktop or web GIS client.
@@ -65,6 +61,30 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+8.0.0 2026-11-02
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Drop support for Python 3.10, 3.11, 3.12 and 3.13. MapProxy now requires Python 3.14
+
+Improvements:
+
+  - Add support for Python 3.15
+
+Maintenance:
+
+  - Raise minimal Pillow version to 13.0.0 because of security fixes
+  - Remove compatibility code for old Pillow versions
+  - Convert ``I`` mode images to 16bit before writing PNG, as Pillow 13 no longer does this implicitly.
+    The output is unchanged
+
+Fixes:
+
+  - Fix decorate_img example in the documentation
+  - Fix MBTiles cache on Python 3.15, sqlite3.connect no longer accepts a positional timeout
+
+
 7.0.0 2026-07-17
 ~~~~~~~~~~~~~~~~
 
@@ -195,25 +215,6 @@ Fixes:
   - Fixed logger for merged configuration files
 
 
-5.1.0 2025-09-30
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - Added `query_layers` option to `wms_opts` to be able to configure the `QUERY_LAYERS` of the wms request
-  - Added workflow to republish docker images if the base image changed, i.e. for security updates
-
-Maintenance:
-
-  - Fixed some spelling and debug output
-  - Updated various dependencies
-
-Fixes:
-
-  - Fixes some errors in the json schema regarding `use_direct_level_from` and `use_direct_res_from`
-  - Fixes an error with merging resolutions of grids
-
-
 
 Older changes
 -------------

mapproxy-8.0.0/MapProxy.egg-info/requires.txt

@@ -0,0 +1,13 @@
+PyYAML>=3.0
+future
+pyproj>=2
+jsonschema>=4
+werkzeug<4
+Pillow>=13.0.0
+lxml>=6
+shapely>=2
+jinja2
+Babel
+python-dateutil
+requests
+multiprocess

{mapproxy-7.0.0 → mapproxy-8.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 7.0.0
+Version: 8.0.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -12,14 +12,12 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
+Requires-Python: >=3.14
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: COPYING.txt
@@ -29,10 +27,7 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow>=9; python_version == "3.10"
-Requires-Dist: Pillow>=10; python_version == "3.11"
-Requires-Dist: Pillow>=10.1; python_version == "3.12"
-Requires-Dist: Pillow>=11; python_version >= "3.13"
+Requires-Dist: Pillow>=13.0.0
 Requires-Dist: lxml>=6
 Requires-Dist: shapely>=2
 Requires-Dist: jinja2
@@ -51,6 +46,7 @@ Dynamic: license-file
 Dynamic: maintainer
 Dynamic: maintainer-email
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 MapProxy is an open source proxy for geospatial data. It caches, accelerates and transforms data from existing map services and serves any desktop or web GIS client.
@@ -65,6 +61,30 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+8.0.0 2026-11-02
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - Drop support for Python 3.10, 3.11, 3.12 and 3.13. MapProxy now requires Python 3.14
+
+Improvements:
+
+  - Add support for Python 3.15
+
+Maintenance:
+
+  - Raise minimal Pillow version to 13.0.0 because of security fixes
+  - Remove compatibility code for old Pillow versions
+  - Convert ``I`` mode images to 16bit before writing PNG, as Pillow 13 no longer does this implicitly.
+    The output is unchanged
+
+Fixes:
+
+  - Fix decorate_img example in the documentation
+  - Fix MBTiles cache on Python 3.15, sqlite3.connect no longer accepts a positional timeout
+
+
 7.0.0 2026-07-17
 ~~~~~~~~~~~~~~~~
 
@@ -195,25 +215,6 @@ Fixes:
   - Fixed logger for merged configuration files
 
 
-5.1.0 2025-09-30
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - Added `query_layers` option to `wms_opts` to be able to configure the `QUERY_LAYERS` of the wms request
-  - Added workflow to republish docker images if the base image changed, i.e. for security updates
-
-Maintenance:
-
-  - Fixed some spelling and debug output
-  - Updated various dependencies
-
-Fixes:
-
-  - Fixes some errors in the json schema regarding `use_direct_level_from` and `use_direct_res_from`
-  - Fixes an error with merging resolutions of grids
-
-
 
 Older changes
 -------------

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/caches.rst

@@ -478,7 +478,10 @@ Available options:
   Defines the directory layout for the tiles (``12/12345/67890.png``, ``L12/R00010932/C00003039.png``, etc.).  See :ref:`cache_file` for available options. Defaults to ``tms`` (e.g. ``12/12345/67890.png``). This cache cache also supports ``reverse_tms`` where tiles are stored as ``y/x/z.format``. See *note* below.
 
 ``use_http_get``:
-  When set to ``true``, requests to S3 ``GetObject`` will be fetched via urllib2 instead of boto, which decreases response times. Defaults to ``false``.
+  When set to ``true``, tiles are read from S3 with plain HTTP requests via ``urllib3`` — ``HEAD`` for existence/metadata checks and ``GET`` for the tile body — instead of the boto3 ``HeadObject``/``GetObject`` API, which decreases response times. Writes still use boto3. Defaults to ``false``.
+
+``username``:
+  Optional S3 access user for a self-hosted endpoint. When set (together with ``endpoint_url`` and ``use_http_get``), it is placed into the read URL path-style as ``{endpoint_url}/{username}:{bucket_name}/{key}``. It is *not* a MapProxy credential and has no paired password — the HTTP ``GET``/``HEAD`` read path is unauthenticated, while boto3 write operations continue to use the standard AWS credential chain (environment, profile, etc.). You can set the default with ``globals.cache.s3.username``.
 
 ``include_grid_name``:
   When set to ``true``, the grid name will be included in the path in the bucket (``[directory]/[grid.name]/[z]/...``). Defaults to ``false``.

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/configuration.rst

@@ -1343,6 +1343,7 @@ Available options are:
 
 ``mode``
   One of ``RGB`` for 24bit images, ``RGBA`` 32bit images with alpha, ``P`` for paletted images or ``I`` for integer images.
+  PNG stores ``I`` images with 16bit, values outside of 0-65535 are clipped. Use TIFF to keep 32bit values.
 
 ``colors``
   The number of colors to reduce the image before encoding. Use ``0`` to disable color reduction (quantizing) for this format and ``256`` for paletted images. See also :ref:`globals.image.paletted <image_paletted>`.

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/decorate_img.rst

@@ -8,9 +8,9 @@ MapProxy provides the ability to update the image produced in response to a WMS
 Decorate Image Middleware
 -------------------------
 
-The ability to decorate the response image is implemented as WSGI middleware in a similar fashion to how :doc:`authorization <auth>` is handled. You must write a WSGI filter which wraps the MapProxy application in order to register a callback which accepts the ImageSource to be decorated.
+The ability to decorate the response image is implemented as WSGI middleware in a similar fashion to how :doc:`authorization <auth>` is handled. You must write a WSGI filter which wraps the MapProxy application in order to register a callback which accepts the ImageResult to be decorated.
 
-The callback is registered by assigning a function to the key ``decorate_img`` in the WSGI environment. Prior to the image being sent in the response MapProxy checks the environment and calls the callback passing the ImageSource and a number of other parameters related to the current request. The callback must then return a valid ImageSource instance which will be sent in the response.
+The callback is registered by assigning a function to the key ``decorate_img`` in the WSGI environment. Prior to the image being sent in the response MapProxy checks the environment and calls the callback passing the ImageResult and a number of other parameters related to the current request. The callback must then return a valid ImageResult instance which will be sent in the response.
 
 WSGI Filter Middleware
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -19,7 +19,7 @@ A simple middleware that annotates each image with information about the request
 
 .. code-block:: python
 
-  from mapproxy.image import ImageSource
+  from mapproxy.image import ImageResult
   from PIL import ImageColor, ImageDraw, ImageFont
 
 
@@ -42,13 +42,12 @@ A simple middleware that annotates each image with information about the request
 
       line_y = 10
       for line in text:
-          line_w, line_h = font.getsize(line)
           draw.text((10, line_y), line, font=font, fill=fill)
-          line_y = line_y + line_h
+          line_y = draw.textbbox((10, line_y), line, font=font)[3]
 
-      # Return a new ImageSource specifying the updated PIL image and
-      # the image options from the original ImageSource
-      return ImageSource(img, image.image_opts)
+      # Return a new ImageResult specifying the updated PIL image and
+      # the image options from the original ImageResult
+      return ImageResult(img, image_opts=image.image_opts)
 
   class RequestInfoFilter(object):
       """
@@ -94,17 +93,17 @@ The signature of the decorate_img function:
 
 .. function:: decorate_img(image, service, layers=[], environ=None, query_extent=None, **kw)
 
-  :param image: ImageSource instance to be decorated
+  :param image: ImageResult instance to be decorated
   :param service: service associated with the current request (e.g. ``wms.map``, ``tms`` or ``wmts``)
   :param layers: list of layer names specified in the request
   :param environ: the request WSGI environment
   :param query_extent: a tuple of the SRS (e.g. ``EPSG:4326``) and the BBOX
     of the request
-  :rtype: ImageSource
+  :rtype: ImageResult
 
   The ``environ`` and ``query_extent`` parameters are optional and can be ignored by the callback. The arguments might get extended in future versions of MapProxy. Therefore you should collect further arguments in a catch-all keyword argument (i.e. ``**kw``).
 
 .. note:: The actual name of the callable is insignificant, only the environment key ``mapproxy.decorate_img`` is important.
 
-The function should return a valid ImageSource instance, either the one passed or a new instance depending the implementation.
+The function should return a valid ImageResult instance, either the one passed or a new instance depending the implementation.
 

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/install.rst

@@ -5,7 +5,7 @@ This tutorial guides you to the MapProxy installation process on Unix systems. F
 
 This tutorial was created and tested with Debian and Ubuntu, if you're installing MapProxy on a different system you might need to change some package names.
 
-MapProxy is `registered at the Python Package Index <https://pypi.org/project/MapProxy/>`_ (PyPI). If you have Python 3.10 or higher, you can install MapProxy with::
+MapProxy is `registered at the Python Package Index <https://pypi.org/project/MapProxy/>`_ (PyPI). If you have Python 3.14 or higher, you can install MapProxy with::
 
   python -m pip install MapProxy
 
@@ -19,15 +19,13 @@ This is really, easy `but` we recommend to install MapProxy into a `virtual Pyth
 Create a new virtual environment
 --------------------------------
 
-``virtualenv`` is available as ``python-virtualenv`` on most Linux systems. You can also `install Virtualenv from source <https://virtualenv.pypa.io/en/latest/installation.html>`_.
+Python ships with the ``venv`` module to create virtual environments. To create a new environment with the name ``venv`` call::
 
-To create a new environment with the name ``venv`` call::
-
-    virtualenv --system-site-packages venv
+    python3.14 -m venv venv
 
 You should now have a Python installation under ``venv/bin/python``.
 
-.. note:: Virtualenv will use your Python system packages (like ``python-imaging`` or ``python-yaml``) only when the virtualenv was created with the ``--system-site-packages`` option.
+.. note:: The virtual environment will use your Python system packages (like ``python3-yaml``) only when it was created with the ``--system-site-packages`` option. This only works if the system Python is version 3.14 or higher.
 
 You need to either prefix all commands with ``venv/bin``, set your ``PATH`` variable to include the bin directory or `activate` the virtualenv with::
 
@@ -39,7 +37,7 @@ This will change the ``PATH`` for your `current` session.
 Install Dependencies
 --------------------
 
-MapProxy is written in Python, thus you will need a working Python installation. MapProxy works with Python 3.10 or higher, which should already be installed with most Linux distributions.
+MapProxy is written in Python, thus you will need a working Python installation. MapProxy works with Python 3.14 or higher. Check the Python version of your Linux distribution, older distributions might need a newer Python installation.
 
 MapProxy requires a few third-party libraries that are required to run.
 
@@ -57,6 +55,8 @@ packages can be quite old, so this is **not recommended**::
 
   sudo apt-get install python3-dev python3-pil python3-yaml python3-pyproj python3-lxml python3-shapely
 
+.. note:: MapProxy requires Pillow 13.0.0 or higher. The ``python3-pil`` package of most distributions is older, in that case pip will install a newer Pillow anyway.
+
 
 Install MapProxy
 ----------------

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/install_docker.rst

@@ -8,14 +8,14 @@ These are currently hosted on the GitHub container registry and can be found her
 
 Currently we have 6 different images for every release, named e.g.
 
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-alpine
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-alpine
 
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-dev
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-alpine-dev
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-dev
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-alpine-dev
 
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-nginx
-  - ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-alpine-nginx
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-nginx
+  - ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-alpine-nginx
 
 The alpine variants use alpine base images and are functionally the same as the other images.
 
@@ -57,15 +57,15 @@ Then pull the image that you want to use, for example:
 
 .. code-block:: sh
 
-  docker pull ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-nginx
+  docker pull ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-nginx
 
 And then run the image like this:
 
 .. code-block:: sh
 
-  docker run --rm --name "mapproxy" -p 80:80 -v `pwd`/mapproxyconfig/mapproxy.yaml:/mapproxy/config/mapproxy.yaml ghcr.io/mapproxy/mapproxy/mapproxy:1.16.0-nginx
+  docker run --rm --name "mapproxy" -p 9090:9090 -v `pwd`/mapproxyconfig/mapproxy.yaml:/mapproxy/config/mapproxy.yaml ghcr.io/mapproxy/mapproxy/mapproxy:8.0.0-nginx
 
-Afterwards, the `MapProxy` instance is running on http://localhost/mapproxy/demo/
+Afterwards, the `MapProxy` instance is running on http://localhost:9090/mapproxy/demo/
 
 
 Configuration
@@ -107,3 +107,11 @@ So if you want to build the alpine nginx image, the command would look like this
 .. code-block:: sh
 
   docker build -f Dockerfile-alpine --target nginx -t ghcr.io/mapproxy/mapproxy/mapproxy:latest-alpine-nginx .
+
+By default, user `mapproxy` (`1000:1000`) is created in the image and used to run the processes.
+If you want to run the image as a different user, you can set the `USER_UID` and `USER_GID` build arguments to your desired values.
+For example, to build the alpine image with user ID 2000 and group ID 2000, you would run:
+
+.. code-block:: sh
+
+  docker build -f Dockerfile-alpine --build-arg USER_UID=2000 --build-arg USER_GID=2000 --target nginx -t ghcr.io/mapproxy/mapproxy/mapproxy:latest-alpine-nginx .

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/install_osgeo4w.rst

@@ -12,6 +12,8 @@ In order to install MapProxy within an OSGeo4W environment, the first step is to
 * Select advanced installation
 * When shown a list of available packages, check (at least) ``python`` and ``python-pil`` for installation.
 
+.. note:: MapProxy requires Python 3.14 and Pillow 13.0.0 or higher. Make sure the Python of your OSGeo4W installation is recent enough. If ``python-pil`` is older than 13.0.0, pip will install a newer Pillow when installing MapProxy.
+
 .. _`OSGeo4W installer`: http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe
 
 Please refer to the `OSGeo4W installer FAQ <http://trac.osgeo.org/osgeo4w/wiki/FAQ>`_ if you've got trouble running it.

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/install_windows.rst

@@ -1,7 +1,7 @@
 Installation on Windows
 =======================
 
-At first you need a working Python installation. You can download Python from: https://www.python.org/download/. MapProxy requires Python 3.10 or higher.
+At first you need a working Python installation. You can download Python from: https://www.python.org/download/. MapProxy requires Python 3.14 or higher.
 
 Virtualenv
 ----------
@@ -11,7 +11,7 @@ Virtualenv
 
 To create a new virtual environment for your MapProxy installation and to activate it go to the command line and call::
 
- C:\Python38\python path\to\virtualenv.py c:\mapproxy_venv
+ C:\Python314\python -m venv c:\mapproxy_venv
  C:\mapproxy_venv\Scripts\activate.bat
 
 .. note::
@@ -32,7 +32,7 @@ PIP
 
 MapProxy and most dependencies can be installed with the ``pip`` command. `Read the pip documentation for more information <https://pip.pypa.io/en/stable/installing/>`_.
 
-    c:\Python38\Scripts\pip install MapProxy
+    c:\Python314\Scripts\pip install MapProxy
 
 This might take a minute.
 
@@ -82,7 +82,7 @@ Platform dependent packages
 
 ``pip`` downloads all packages from https://pypi.org/, but not all platform combinations might be available as a binary package, especially if you run a 64bit version of Python.
 
-If you run into trouble during installation, because it is trying to compile something (e.g. complaining about ``vcvarsall.bat``), you should look at Christoph Gohlke's `Unofficial Windows Binaries for Python Extension Packages <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_. This is a reliable site for binary packages for Python. You need to download the right package: The ``cpxx`` code refers to the Python version (e.g. ``cp310`` for Python 3.10); ``win32`` for 32bit Python installations and ``amd64`` for 64bit.
+If you run into trouble during installation, because it is trying to compile something (e.g. complaining about ``vcvarsall.bat``), you should look at Christoph Gohlke's `Unofficial Windows Binaries for Python Extension Packages <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_. This is a reliable site for binary packages for Python. You need to download the right package: The ``cpxx`` code refers to the Python version (e.g. ``cp314`` for Python 3.14); ``win32`` for 32bit Python installations and ``amd64`` for 64bit.
 
 You can install the ``.whl``, ``.zip`` or ``.exe`` packages with ``pip``::
 

{mapproxy-7.0.0 → mapproxy-8.0.0}/doc/plugins.rst

@@ -2,7 +2,7 @@ Writing plugins
 ===============
 
 Since MapProxy 1.15, it is possible to write plugins for MapProxy that can
-add new sources, services or commands. This requires Python >= 3.7
+add new sources, services or commands. This requires Python >= 3.14
 
 Example
 -------

{mapproxy-7.0.0 → mapproxy-8.0.0}/mapproxy/cache/mbtiles.py

@@ -73,7 +73,7 @@ class MBTilesCache(TileCacheBase):
     def db(self):
         if not getattr(self._db_conn_cache, 'db', None):
             self.ensure_mbtile()
-            self._db_conn_cache.db = sqlite3.connect(self.mbtile_file, self.timeout)
+            self._db_conn_cache.db = sqlite3.connect(self.mbtile_file, timeout=self.timeout)
         return self._db_conn_cache.db
 
     def cleanup(self):