summaryrefslogtreecommitdiff
path: root/simplejson
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2016-02-14 12:30:55 -0800
committerBob Ippolito <bob@redivi.com>2016-02-15 09:51:34 -0800
commit8aaf1ca7d6cda799997815591c1c82e70c51a633 (patch)
treec0a3471da60ae560dc1f43f0ffabfdbbff6b40e0 /simplejson
parent60227944e9879362f9a4e09dfaae605273cdfc8c (diff)
downloadsimplejson-8aaf1ca7d6cda799997815591c1c82e70c51a633.tar.gz
v3.8.2 - fix compiler warning, automated wheel builds for Windows and Macv3.8.2wheels
Diffstat (limited to 'simplejson')
-rw-r--r--simplejson/__init__.py2
-rw-r--r--simplejson/_speedups.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index c448742..b7fe828 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
Expecting property name: line 1 column 3 (char 2)
"""
from __future__ import absolute_import
-__version__ = '3.8.1'
+__version__ = '3.8.2'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
diff --git a/simplejson/_speedups.c b/simplejson/_speedups.c
index 173c5e1..9976464 100644
--- a/simplejson/_speedups.c
+++ b/simplejson/_speedups.c
@@ -2654,7 +2654,7 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
if (PyInt_Check(int_as_string_bitcount) || PyLong_Check(int_as_string_bitcount)) {
static const unsigned int long_long_bitsize = SIZEOF_LONG_LONG * 8;
int int_as_string_bitcount_val = (int)PyLong_AsLong(int_as_string_bitcount);
- if (int_as_string_bitcount_val > 0 && int_as_string_bitcount_val < long_long_bitsize) {
+ if (int_as_string_bitcount_val > 0 && int_as_string_bitcount_val < (int)long_long_bitsize) {
s->max_long_size = PyLong_FromUnsignedLongLong(1ULL << int_as_string_bitcount_val);
s->min_long_size = PyLong_FromLongLong(-1LL << int_as_string_bitcount_val);
if (s->min_long_size == NULL || s->max_long_size == NULL) {