[Python-modules-commits] [python-mkdocs] 10/11: 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 68ea91d760118b7b686edebd46436b8d89508b78
Merge: a78e678 99c1ff8
Author: Brian May <bam at debian.org>
Date:   Mon May 2 16:07:55 2016 +1000

    merge patched into master

 debian/.git-dpm                                               |  4 ++--
 .../0002-Use-themes-from-usr-share-mkdocs-themes.patch        | 11 +++++------
 mkdocs/utils/__init__.py                                      |  1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index cf6d5eb,0000000..be49c85
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
- 8a52c870c88da7c47fcaae7e2832a6ed9faa83ec
- 8a52c870c88da7c47fcaae7e2832a6ed9faa83ec
++99c1ff8819d7ff180fb0f053a148fd857ab1ce9f
++99c1ff8819d7ff180fb0f053a148fd857ab1ce9f
 +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 f9995a5,0000000..096f9ac
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,40 -1,0 +1,39 @@@
- From 8a52c870c88da7c47fcaae7e2832a6ed9faa83ec Mon Sep 17 00:00:00 2001
++From 99c1ff8819d7ff180fb0f053a148fd857ab1ce9f 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 | 14 ++++++++++----
-  1 file changed, 10 insertions(+), 4 deletions(-)
++ mkdocs/utils/__init__.py | 13 +++++++++----
++ 1 file changed, 9 insertions(+), 4 deletions(-)
 +
 +diff --git a/mkdocs/utils/__init__.py b/mkdocs/utils/__init__.py
- index 9b85fc0..59d1182 100644
++index 9b85fc0..7859bca 100644
 +--- a/mkdocs/utils/__init__.py
 ++++ b/mkdocs/utils/__init__.py
- @@ -363,15 +363,21 @@ def get_themes():
++@@ -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())
- +    print(themes)
 + 
 +     return themes
 + 

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