Merge lp:~stefanor/ibid/float-maths into lp:~ibid-core/ibid/old-trunk-1.6

[Stefano Rivera]

[Jonathan Hitchcock (vhata)]

review: Approve

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/maths.py'
--- ibid/plugins/maths.py	2010-01-11 22:49:21 +0000
+++ ibid/plugins/maths.py	2010-01-12 10:58:12 +0000
@@ -1,4 +1,5 @@
 from __future__ import division
+
 import logging
 from os import kill
 import re
@@ -18,9 +19,12 @@
 
 except ImportError:
     from compiler import ast, pycodegen, parse, misc, walk
+    transform_method='compiler'
     class NodeTransformer(object):
         pass
-    transform_method='compiler'
+    # ExpressionCodeGenerator doesn't inherit __futures__ from calling module:
+    class FD_ExpressionCodeGenerator(pycodegen.ExpressionCodeGenerator):
+        futures = ('division',)
 
 help = {}
 log = logging.getLogger('maths')
@@ -161,7 +165,7 @@
             else:
                 misc.set_filename('<string>', ast)
                 walk(ast, PowSubstitutionWalker())
-                code = pycodegen.ExpressionCodeGenerator(ast).getCode()
+                code = FD_ExpressionCodeGenerator(ast).getCode()
 
             result = eval(code, {'__builtins__': None}, self.safe)