[Python-modules-commits] [pypandoc] 07/08: merge patched into master

[Elena Grandi]

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

valhalla-guest pushed a commit to branch master
in repository pypandoc.

commit f1bdeab0c4cc7ace290327eda42aa93dcc3c0c22
Merge: a227d5a f24e93e
Author: Elena Grandi <valhalla-d at trueelena.org>
Date:   Sat Nov 5 13:51:04 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...g-of-unicode-paths-on-non-unicode-locales.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pypandoc/__init__.py                               |  3 +--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 377abc9,0000000..61d14a5
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
- 19c9b81c330719abc5d848a09f3bf429f555b5ee
- 19c9b81c330719abc5d848a09f3bf429f555b5ee
++f24e93e8ba0403556b2e3b905790ad356c0f3757
++f24e93e8ba0403556b2e3b905790ad356c0f3757
 +4e350f81f02df42ad871d205108145cbf38860a4
 +4e350f81f02df42ad871d205108145cbf38860a4
 +pypandoc_1.3.3+ds0.orig.tar.gz
 +ba9713e7edc6f6b5433b4e909917484a06b39b10
 +18968
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch
index 0000000,0000000..a00cb6c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch
@@@ -1,0 -1,0 +1,23 @@@
++From f24e93e8ba0403556b2e3b905790ad356c0f3757 Mon Sep 17 00:00:00 2001
++From: Elena Grandi <valhalla-d at trueelena.org>
++Date: Sat, 5 Nov 2016 13:50:56 +0100
++Subject: Fix parsing of unicode paths on non-unicode locales
++
++---
++ pypandoc/__init__.py | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/pypandoc/__init__.py b/pypandoc/__init__.py
++index 8da7529..c6f18ec 100644
++--- a/pypandoc/__init__.py
+++++ b/pypandoc/__init__.py
++@@ -149,8 +149,7 @@ def _identify_path(source):
++     try:
++         path = os.path.exists(source)
++     except UnicodeEncodeError:
++-        source = source.encode('utf-8')
++-        path = os.path.exists(source)
+++        path = os.path.exists(source.encode('utf-8'))
++     except:
++         path  # still false
++ 
diff --cc debian/patches/series
index 925fd05,0000000..8f271e4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Skip-test-s-that-require-the-network.patch
++0002-Fix-parsing-of-unicode-paths-on-non-unicode-locales.patch

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