[tryton-debian-vcs] simpleeval branch debian updated. 588da26a25183c91137e905f9b83fe5b0febccea

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/simpleeval.git;a=commitdiff;h=588da26a25183c91137e905f9b83fe5b0febccea

commit 588da26a25183c91137e905f9b83fe5b0febccea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Apr 26 14:37:40 2015 +0200

    Re-enabling build tests.

diff --git a/debian/rules b/debian/rules
index 93b66bc..a0d8f2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME := simpleeval
-# disable temporarily testing due to failing test test_string_length
-# https://github.com/danthedeckie/simpleeval/issues/5
-export PYBUILD_DISABLE_python2.7=test
-export PYBUILD_DISABLE_python3.4=test
 
 %:
 	dh ${@} --with python2,python3 --buildsystem=pybuild
commit af12551428d0beddfe01df255246fffd1bbb84f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Apr 26 14:34:54 2015 +0200

    Adding 02-add-test-fix.
    
    Adds the commit from the upstream VCS to fix test errors:
    https://github.com/danthedeckie/simpleeval/commit/aaee5030d20bd832373485e2c78084f4d92227f7

diff --git a/debian/patches/02-add-test-fix b/debian/patches/02-add-test-fix
new file mode 100644
index 0000000..5a83f53
--- /dev/null
+++ b/debian/patches/02-add-test-fix
@@ -0,0 +1,34 @@
+Description: Adding fix for raise StringTooLong
+ Patch from upstream VCS aaee5030d20bd832373485e2c78084f4d92227f7
+ to fix test errors.
+Origin: upstream, https://github.com/danthedeckie/simpleeval/commit/aaee5030d20bd832373485e2c78084f4d92227f7
+Bug: https://github.com/danthedeckie/simpleeval/issues/5
+Forwarded: not-needed
+
+--- simpleeval.orig/simpleeval.py	2015-04-26 14:23:51.000000000 +0200
++++ simpleeval/simpleeval.py	2015-04-26 14:23:51.000000000 +0200
+@@ -218,9 +218,9 @@
+             return node.n
+         elif isinstance(node, ast.Str): # <string>
+             if len(node.s) > MAX_STRING_LENGTH:
+-                raise StringTooLong("{0} is too long!"
+-                                    " ({1}, when {2} is max)".format(
+-                                    node.id, len(node.s), MAX_STRING_LENGTH))
++                raise StringTooLong("String Literal in statement is too long!"
++                                    " ({0}, when {1} is max)".format(
++                                    len(node.s), MAX_STRING_LENGTH))
+             return node.s
+ 
+         # python 3 compatibility:
+@@ -263,7 +263,10 @@
+                 elif callable(self.names):
+                     return self.names(node)
+                 else:
+-                    raise KeyError('undefined name')
++                    raise InvalidExpression('Trying to use name (variable) "{0}"'
++                                            ' when no "names" defined for'
++                                            ' evaluator'.format(node.id))
++
+             except KeyError:
+                 raise NameNotDefined(node.id, self.expr)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a778174..9724311 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-add_testfile.patch
+02-add-test-fix
-- 
simpleeval