[Python-modules-commits] [python-mkdocs] 04/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 8adfe86b290b79a4449491b796c2c75d09c0248b
Merge: 2fe7d2e 3115074
Author: Brian May <bam at debian.org>
Date:   Wed May 11 09:47:43 2016 +1000

    merge patched into master

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

diff --cc debian/.git-dpm
index c9ed6d8,0000000..995fcb6
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
- b83671b11e82c626caed1c8cfaae3e5f4eec23fd
- b83671b11e82c626caed1c8cfaae3e5f4eec23fd
++31150740d5b7b66013f63192aced354883cb5022
++31150740d5b7b66013f63192aced354883cb5022
 +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 0e78686,0000000..3d29f8a
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,36 -1,0 +1,23 @@@
- From b83671b11e82c626caed1c8cfaae3e5f4eec23fd Mon Sep 17 00:00:00 2001
++From 31150740d5b7b66013f63192aced354883cb5022 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/__init__.py       | 2 ++
-  mkdocs/utils/__init__.py | 1 -
-  2 files changed, 2 insertions(+), 1 deletion(-)
++ mkdocs/__init__.py | 2 ++
++ 1 file changed, 2 insertions(+)
 +
 +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..ff432cf 100644
- --- a/mkdocs/utils/__init__.py
- +++ b/mkdocs/utils/__init__.py
- @@ -28,7 +28,6 @@ except ImportError:                                         # pragma: no cover
-      from urllib import pathname2url                         # noqa
-      from UserDict import UserDict                           # noqa
-  
- -
-  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