[sasview] 02/06: Fix uniquelist builtin handling

[Stuart Prescott]

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

stuart pushed a commit to branch master
in repository sasview.

commit b9d1f5d5de2f5638830306154c0e583d05a7d790
Author: Stuart Prescott <stuart at debian.org>
Date:   Fri Nov 3 00:37:29 2017 +1100

    Fix uniquelist builtin handling
---
 debian/patches/series                   |  1 +
 debian/patches/uniquelist-builtin.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 2d69162..ec146d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 batchgrid-image-path.patch
+uniquelist-builtin.patch
 setup-entry-point.patch
 limit-docs-sasview.patch
 sphinx-local-mathjax.patch
diff --git a/debian/patches/uniquelist-builtin.patch b/debian/patches/uniquelist-builtin.patch
new file mode 100644
index 0000000..2eae47d
--- /dev/null
+++ b/debian/patches/uniquelist-builtin.patch
@@ -0,0 +1,26 @@
+Description: Fix handling of builtins in uniquelist
+Author: Stuart Prescott <stuart at debian.org>
+Forwarded: https://github.com/SasView/sasview/pull/123
+--- a/src/sas/sascalc/data_util/uniquelist.py
++++ b/src/sas/sascalc/data_util/uniquelist.py
+@@ -1,5 +1,11 @@
+ #
+ 
++try:
++    from __builtin__ import hash as builtin_hash
++except ImportError:
++    from builtins import hash as builtin_hash
++
++
+ def uniquelist(inputlist, hash=None): 
+     '''remove redunduant elements from the give list
+     and return a list of unique elements.
+@@ -11,7 +17,7 @@
+         This function is order-preserving.
+     '''
+     if hash is None:
+-        hash = __builtins__.hash
++        hash = builtin_hash
+     seen = {}
+     result = []
+     for item in inputlist:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sasview.git