sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1945 from tomhughes/python

Browse source 
Fix numeric truncation issues in python bindings
This commit is contained in:
Dane Springmeyer 2013-07-10 16:47:29 -07:00
commit 9be53df112
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bindings/python/mapnik_value_converter.hpp
View file

@ -35,11 +35,7 @@ namespace boost { namespace python {
{
PyObject * operator() (mapnik::value_integer val) const
{
#if PY_VERSION_HEX >= 0x03000000
return ::PyLong_FromLong(val);
#else
return ::PyInt_FromLong(val);
#endif
return ::PyLong_FromLongLong(val);
}
PyObject * operator() (double val) const

1
tests/python_tests/csv_test.py
View file

@ -540,7 +540,6 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
feat = fs.next()
eq_(feat['bigint'],2147483648)
feat = fs.next()
eq_(feat['bigint'],sys.maxint)
eq_(feat['bigint'],9223372036854775807)
eq_(feat['bigint'],0x7FFFFFFFFFFFFFFF)
desc = ds.describe()

30
tests/python_tests/filter_test.py
View file

@ -217,14 +217,14 @@ def test_creation_of_bool():
eq_(f["bool"],True)
# TODO - will become int of 1 do to built in boost python conversion
# https://github.com/mapnik/mapnik/issues/1873
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],int),True)
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],long),True)
f["bool"] = False
eq_(f["bool"],False)
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],int),True)
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],long),True)
# test NoneType
f["bool"] = None
eq_(f["bool"],None)
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],int),False)
eq_(isinstance(f["bool"],bool) or isinstance(f["bool"],long),False)
# test integer
f["bool"] = 0
eq_(f["bool"],0)
@ -235,16 +235,16 @@ def test_creation_of_bool():
null_equality = [
['hello',False,unicode],
[u'',False,unicode],
[0,False,int],
[123,False,int],
[0,False,long],
[123,False,long],
[0.0,False,float],
[123.123,False,float],
[.1,False,float],
[False,False,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[True,False,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[False,False,long], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[True,False,long], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[None,True,None],
[2147483648,False,int],
[922337203685477580,False,int]
[2147483648,False,long],
[922337203685477580,False,long]
]
def test_expressions_with_null_equality():
@ -283,16 +283,16 @@ def test_expressions_with_null_equality2():
truthyness = [
[u'hello',True,unicode],
[u'',False,unicode],
[0,False,int],
[123,True,int],
[0,False,long],
[123,True,long],
[0.0,False,float],
[123.123,True,float],
[.1,True,float],
[False,False,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[True,True,int], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[False,False,long], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[True,True,long], # TODO - should become bool: https://github.com/mapnik/mapnik/issues/1873
[None,False,None],
[2147483648,True,int],
[922337203685477580,True,int]
[2147483648,True,long],
[922337203685477580,True,long]
]
def test_expressions_for_thruthyness():