[Python-modules-commits] [safe] 05/08: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository safe.

commit fce33e000750daa7073978f65f76013409bb87a6
Merge: 734b3bc 7331200
Author: Carl Suster <carl at contraflo.ws>
Date:   Sat Jan 7 17:56:03 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-read-words.dat-from-usr-share-safe.patch  | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 safe/__init__.py                                   |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 0101355,0000000..ae543a2
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- e162d04c94f09a1df674ea2b4a6f8f11bf581235
- e162d04c94f09a1df674ea2b4a6f8f11bf581235
++7331200218e2a4179d94d173dfbfa256186c1f9a
++7331200218e2a4179d94d173dfbfa256186c1f9a
 +e162d04c94f09a1df674ea2b4a6f8f11bf581235
 +e162d04c94f09a1df674ea2b4a6f8f11bf581235
 +safe-0.4.orig.tar.gz
 +792458c7cff9df26ad4af86ae59ba6602547e3ee
 +56803
diff --cc debian/patches/0001-read-words.dat-from-usr-share-safe.patch
index 0000000,0000000..2829d98
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-read-words.dat-from-usr-share-safe.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 7331200218e2a4179d94d173dfbfa256186c1f9a Mon Sep 17 00:00:00 2001
++From: Carl Suster <carl at contraflo.ws>
++Date: Sat, 7 Jan 2017 17:54:59 +1100
++Subject: read words.dat from /usr/share/safe
++
++The data file words.dat is moved to /usr/share/safe in the Debian
++package so read the file from there.
++---
++ safe/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/safe/__init__.py b/safe/__init__.py
++index 10e0624..40597b1 100644
++--- a/safe/__init__.py
+++++ b/safe/__init__.py
++@@ -52,7 +52,7 @@ def _load_words():
++ 
++     filepath = os.environ.get(
++         'PYTHON_SAFE_WORDS_FILE',
++-        os.path.join(os.path.dirname(__file__), 'words.dat'),
+++        os.path.join('/usr/share/safe', 'words.dat'),
++     )
++     words = {}
++     with open(filepath, 'rb') as f:
diff --cc debian/patches/series
index 0000000,0000000..2325a5e
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-read-words.dat-from-usr-share-safe.patch

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