[tilestache] 02/22: Imported Upstream version 1.49.10
Bas Couwenberg
sebastic at debian.org
Thu Oct 27 21:40:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository tilestache.
commit 2d4d987894a904cacf4c860df64dfa116d211f82
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Oct 17 08:30:27 2016 +0200
Imported Upstream version 1.49.10
---
PKG-INFO | 2 +-
TileStache/Mapnik.py | 6 ++++++
TileStache/Memcache.py | 6 ++++++
TileStache/Redis.py | 5 +++++
TileStache/VERSION | 2 +-
doc/TileStache.Mapnik.html | 3 ++-
doc/TileStache.Memcache.html | 9 ++++++++-
doc/TileStache.Redis.html | 9 ++++++++-
doc/TileStache.html | 4 ++--
doc/index.html | 2 +-
10 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index 3e2f0a1..3203a25 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: TileStache
-Version: 1.49.9
+Version: 1.49.10
Summary: A stylish alternative for caching your map tiles.
Home-page: http://tilestache.org
Author: Michal Migurski
diff --git a/TileStache/Mapnik.py b/TileStache/Mapnik.py
index 24120a8..de148f3 100644
--- a/TileStache/Mapnik.py
+++ b/TileStache/Mapnik.py
@@ -4,6 +4,7 @@ ImageProvider is known as "mapnik" in TileStache config, GridProvider is
known as "mapnik grid". Both require Mapnik to be installed; Grid requires
Mapnik 2.0.0 and above.
"""
+from __future__ import absolute_import
from time import time
from os.path import exists
from thread import allocate_lock
@@ -17,6 +18,11 @@ import os
import logging
import json
+# We enabled absolute_import because case insensitive filesystems
+# cause this file to be loaded twice (the name of this file
+# conflicts with the name of the module we want to import).
+# Forcing absolute imports fixes the issue.
+
try:
import mapnik
except ImportError:
diff --git a/TileStache/Memcache.py b/TileStache/Memcache.py
index 1a1f332..43f5494 100644
--- a/TileStache/Memcache.py
+++ b/TileStache/Memcache.py
@@ -31,8 +31,14 @@ Memcache cache parameters:
"""
+from __future__ import absolute_import
from time import time as _time, sleep as _sleep
+# We enabled absolute_import because case insensitive filesystems
+# cause this file to be loaded twice (the name of this file
+# conflicts with the name of the module we want to import).
+# Forcing absolute imports fixes the issue.
+
try:
from memcache import Client
except ImportError:
diff --git a/TileStache/Redis.py b/TileStache/Redis.py
index e7c5baa..a8a7483 100644
--- a/TileStache/Redis.py
+++ b/TileStache/Redis.py
@@ -39,8 +39,13 @@ Redis cache parameters:
"""
+from __future__ import absolute_import
from time import time as _time, sleep as _sleep
+# We enabled absolute_import because case insensitive filesystems
+# cause this file to be loaded twice (the name of this file
+# conflicts with the name of the module we want to import).
+# Forcing absolute imports fixes the issue.
try:
import redis
diff --git a/TileStache/VERSION b/TileStache/VERSION
index 077f4d0..300ca1e 100644
--- a/TileStache/VERSION
+++ b/TileStache/VERSION
@@ -1 +1 @@
-1.49.9
+1.49.10
diff --git a/doc/TileStache.Mapnik.html b/doc/TileStache.Mapnik.html
index 7449a41..b818411 100644
--- a/doc/TileStache.Mapnik.html
+++ b/doc/TileStache.Mapnik.html
@@ -201,5 +201,6 @@ Fractions of a second may be present if
<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
-<td width="100%"><strong>global_mapnik_lock</strong> = <thread.lock object></td></tr></table>
+<td width="100%"><strong>absolute_import</strong> = _Feature((2, 5, 0, 'alpha', 1), (3, 0, 0, 'alpha', 0), 16384)<br>
+<strong>global_mapnik_lock</strong> = <thread.lock object></td></tr></table>
</body></html>
\ No newline at end of file
diff --git a/doc/TileStache.Memcache.html b/doc/TileStache.Memcache.html
index 568fb8b..4e1d10f 100644
--- a/doc/TileStache.Memcache.html
+++ b/doc/TileStache.Memcache.html
@@ -79,5 +79,12 @@ Returns nothing, but blocks until the lock ha
<tr><td bgcolor="#eeaa77"><tt> </tt></td><td> </td>
<td width="100%"><dl><dt><a name="-tile_key"><strong>tile_key</strong></a>(layer, coord, format, rev, key_prefix)</dt><dd><tt>Return a tile key string.</tt></dd></dl>
-</td></tr></table>
+</td></tr></table><p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#55aa55">
+<td colspan=3 valign=bottom> <br>
+<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
+
+<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
+<td width="100%"><strong>absolute_import</strong> = _Feature((2, 5, 0, 'alpha', 1), (3, 0, 0, 'alpha', 0), 16384)</td></tr></table>
</body></html>
\ No newline at end of file
diff --git a/doc/TileStache.Redis.html b/doc/TileStache.Redis.html
index 969b0f1..e4cc61c 100644
--- a/doc/TileStache.Redis.html
+++ b/doc/TileStache.Redis.html
@@ -94,5 +94,12 @@ Returns nothing, but blocks until the lock ha
<tr><td bgcolor="#eeaa77"><tt> </tt></td><td> </td>
<td width="100%"><dl><dt><a name="-tile_key"><strong>tile_key</strong></a>(layer, coord, format, key_prefix)</dt><dd><tt>Return a tile key string.</tt></dd></dl>
-</td></tr></table>
+</td></tr></table><p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#55aa55">
+<td colspan=3 valign=bottom> <br>
+<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
+
+<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
+<td width="100%"><strong>absolute_import</strong> = _Feature((2, 5, 0, 'alpha', 1), (3, 0, 0, 'alpha', 0), 16384)</td></tr></table>
</body></html>
\ No newline at end of file
diff --git a/doc/TileStache.html b/doc/TileStache.html
index 49a689a..1cc721a 100644
--- a/doc/TileStache.html
+++ b/doc/TileStache.html
@@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom> <br>
-<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>TileStache</strong></big></big> (version 1.49.9)</font></td
+<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>TileStache</strong></big></big> (version 1.49.10)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a></font></td></tr></table>
<p><tt>A stylish alternative for caching your map tiles.<br>
@@ -190,6 +190,6 @@ Fractions of a second may be present if
<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
-<td width="100%"><strong>__version__</strong> = '1.49.9'<br>
+<td width="100%"><strong>__version__</strong> = '1.49.10'<br>
<strong>stdout</strong> = <open file '<stdout>', mode 'w'></td></tr></table>
</body></html>
\ No newline at end of file
diff --git a/doc/index.html b/doc/index.html
index 512c76b..2a2a83c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -76,7 +76,7 @@
</p>
<p>
- <strong>This document covers TileStache version </strong>.
+ <strong>This document covers TileStache version 1.49.10</strong>.
</p>
<p>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/tilestache.git
More information about the Pkg-grass-devel
mailing list