[Python-modules-commits] [python-fisx] 02/03: fix unit test

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-fisx.

commit c31952337895ba117b74fab7c9612f5a1afcd2e5
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sat Jun 25 18:11:01 2016 +0200

    fix unit test
---
 debian/patches/0001-fix-test-on-python3.5.patch | 32 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/0001-fix-test-on-python3.5.patch b/debian/patches/0001-fix-test-on-python3.5.patch
new file mode 100644
index 0000000..258d926
--- /dev/null
+++ b/debian/patches/0001-fix-test-on-python3.5.patch
@@ -0,0 +1,32 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Sat, 25 Jun 2016 16:53:54 +0200
+Subject: fix test on python3.5
+
+---
+ python/fisx/DataDir.py | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/python/fisx/DataDir.py b/python/fisx/DataDir.py
+index 16ee9a5..f6d929d 100644
+--- a/python/fisx/DataDir.py
++++ b/python/fisx/DataDir.py
+@@ -30,18 +30,6 @@ import os
+ FISX_DATA_DIR = 'DATA_DIR_FROM_SETUP'
+ # this is to be filled by the setup
+ FISX_DOC_DIR = 'DOC_DIR_FROM_SETUP'
+-# what follows is only used in frozen versions
+-if not os.path.exists(FISX_DATA_DIR):
+-    tmp_dir = os.path.dirname(__file__)
+-    old_tmp_dir = tmp_dir + "dummy"
+-    basename = os.path.basename(FISX_DATA_DIR)
+-    FISX_DATA_DIR = os.path.join(tmp_dir, "fisx", basename)
+-    while (len(FISX_DATA_DIR) > 14) and (tmp_dir != old_tmp_dir):
+-        if os.path.exists(FISX_DATA_DIR):
+-            break
+-        old_tmp_dir = tmp_dir
+-        tmp_dir = os.path.dirname(tmp_dir)
+-        FISX_DATA_DIR = os.path.join(tmp_dir, basename)
+ 
+ # this is used in build directory
+ if not os.path.exists(FISX_DATA_DIR):
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c7440c8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-test-on-python3.5.patch

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