[Python-modules-commits] [python-mkdocs] 02/05: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository python-mkdocs.

commit 2fe7d2e9a32d1cac57f6d22c622a7d14d80a07a7
Merge: af33c19 b83671b
Author: Brian May <bam at debian.org>
Date:   Wed May 11 09:45:54 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...2-Use-themes-from-usr-share-mkdocs-themes.patch | 51 ++++++++++------------
 mkdocs/__init__.py                                 |  2 +
 mkdocs/utils/__init__.py                           | 14 ++----
 4 files changed, 32 insertions(+), 39 deletions(-)

diff --cc debian/.git-dpm
index be49c85,0000000..c9ed6d8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 99c1ff8819d7ff180fb0f053a148fd857ab1ce9f
- 99c1ff8819d7ff180fb0f053a148fd857ab1ce9f
++b83671b11e82c626caed1c8cfaae3e5f4eec23fd
++b83671b11e82c626caed1c8cfaae3e5f4eec23fd
 +47dd578a2b91cacc50aec47aff24b7b75581e08a
 +47dd578a2b91cacc50aec47aff24b7b75581e08a
 +python-mkdocs_0.15.3.orig.tar.gz
 +544760693a444da8f7b005ddc69b30e8ad69f3df
 +1805972
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
index 096f9ac,0000000..0e78686
mode 100644,000000..100644
--- a/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
+++ b/debian/patches/0002-Use-themes-from-usr-share-mkdocs-themes.patch
@@@ -1,39 -1,0 +1,36 @@@
- From 99c1ff8819d7ff180fb0f053a148fd857ab1ce9f Mon Sep 17 00:00:00 2001
++From b83671b11e82c626caed1c8cfaae3e5f4eec23fd Mon Sep 17 00:00:00 2001
 +From: Brian May <bam at debian.org>
 +Date: Mon, 2 May 2016 15:53:46 +1000
 +Subject: Use themes from /usr/share/mkdocs/themes
 +
 +See https://lists.debian.org/debian-python/2016/04/msg00042.html
 +---
-  mkdocs/utils/__init__.py | 13 +++++++++----
-  1 file changed, 9 insertions(+), 4 deletions(-)
++ mkdocs/__init__.py       | 2 ++
++ mkdocs/utils/__init__.py | 1 -
++ 2 files changed, 2 insertions(+), 1 deletion(-)
 +
++diff --git a/mkdocs/__init__.py b/mkdocs/__init__.py
++index 170bf76..6fe2e34 100644
++--- a/mkdocs/__init__.py
+++++ b/mkdocs/__init__.py
++@@ -5,6 +5,8 @@ from __future__ import unicode_literals
++ 
++ import sys
++ 
+++sys.path.insert(1, "/usr/share/mkdocs/themes")
+++
++ if sys.version_info < (2, 7):
++     sys.stderr.write(("WARNING: Support for Python 2.6 will be dropped in the "
++                       "1.0.0 release of MkDocs\n\n"))
 +diff --git a/mkdocs/utils/__init__.py b/mkdocs/utils/__init__.py
- index 9b85fc0..7859bca 100644
++index 9b85fc0..ff432cf 100644
 +--- a/mkdocs/utils/__init__.py
 ++++ b/mkdocs/utils/__init__.py
- @@ -363,15 +363,20 @@ def get_themes():
-                  "with the same name".format(theme.name, theme.dist.key))
-  
-          elif theme.name in themes:
- -            multiple_packages = [themes[theme.name].dist.key, theme.dist.key]
- +            multiple_packages = [themes[theme.name], theme.dist.key]
-              log.warning("The theme %s is provided by the Python packages "
-                          "'%s'. The one in %s will be used.",
-                          theme.name, ','.join(multiple_packages), theme.dist.key)
-  
- -        themes[theme.name] = theme
- +        if theme.name in builtins:
- +            themes[theme.name] = os.path.dirname(
- +                os.path.abspath(theme.load().__file__))
- +        else:
- +            themes[theme.name] = os.path.join(
- +                "/usr/share/mkdocs/themes",
- +                theme.dist.key, theme.name)
-  
- -    themes = dict((name, os.path.dirname(os.path.abspath(theme.load().__file__)))
- -                  for name, theme in themes.items())
- +    themes = dict((name, theme_path) for name, theme_path in themes.items())
++@@ -28,7 +28,6 @@ except ImportError:                                         # pragma: no cover
++     from urllib import pathname2url                         # noqa
++     from UserDict import UserDict                           # noqa
 + 
-      return themes
++-
++ PY3 = sys.version_info[0] == 3
 + 
++ if PY3:                         # pragma: no cover

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mkdocs.git