From df234fa2520d5a00a5cfadc08406ad6e39ca693c Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 15 Sep 2014 18:30:37 -0500
Subject: [PATCH] reverted simplejson

---
 Makefile                                 | 2 +-
 VERSION                                  | 2 +-
 gluon/contrib/simplejson/__init__.py     | 4 +++-
 gluon/contrib/simplejson/decoder.py      | 2 ++
 gluon/contrib/simplejson/encoder.py      | 2 ++
 gluon/contrib/simplejson/ordered_dict.py | 1 +
 gluon/contrib/simplejson/scanner.py      | 2 ++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 831a5ff4..b36ed79f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.9.10-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.9.11-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps
diff --git a/VERSION b/VERSION
index 443d77dd..736df562 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.10-stable+timestamp.2014.09.15.08.05.10
+Version 2.9.11-stable+timestamp.2014.09.15.18.30.31
diff --git a/gluon/contrib/simplejson/__init__.py b/gluon/contrib/simplejson/__init__.py
index a4d11deb..95934cc6 100644
--- a/gluon/contrib/simplejson/__init__.py
+++ b/gluon/contrib/simplejson/__init__.py
@@ -121,6 +121,7 @@ OrderedDict = _import_OrderedDict()
 
 def _import_c_make_encoder():
     try:
+        raise ImportError # because assumes simplejson in path
         from simplejson._speedups import make_encoder
         return make_encoder
     except ImportError:
@@ -410,7 +411,7 @@ def _toggle_speedups(enabled):
     if enabled:
         dec.scanstring = dec.c_scanstring or dec.py_scanstring
         enc.c_make_encoder = c_make_encoder
-        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or 
+        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
             enc.py_encode_basestring_ascii)
         scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
     else:
@@ -436,3 +437,4 @@ def _toggle_speedups(enabled):
        encoding='utf-8',
        default=None,
    )
+
diff --git a/gluon/contrib/simplejson/decoder.py b/gluon/contrib/simplejson/decoder.py
index c2d4a0e0..0f7d5f1c 100644
--- a/gluon/contrib/simplejson/decoder.py
+++ b/gluon/contrib/simplejson/decoder.py
@@ -7,6 +7,7 @@ import struct
 from scanner import make_scanner
 def _import_c_scanstring():
     try:
+        raise ImportError # because assumes simplejson in path
         from simplejson._speedups import scanstring
         return scanstring
     except ImportError:
@@ -419,3 +420,4 @@ class JSONDecoder(object):
         except StopIteration:
             raise JSONDecodeError("No JSON object could be decoded", s, idx)
         return obj, end
+
diff --git a/gluon/contrib/simplejson/encoder.py b/gluon/contrib/simplejson/encoder.py
index bde9b0b0..db085deb 100644
--- a/gluon/contrib/simplejson/encoder.py
+++ b/gluon/contrib/simplejson/encoder.py
@@ -5,6 +5,7 @@ from decimal import Decimal
 
 def _import_speedups():
     try:
+        raise ImportError # because assumes simplejson in path
         from simplejson import _speedups
         return _speedups.encode_basestring_ascii, _speedups.make_encoder
     except ImportError:
@@ -499,3 +500,4 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
                 del markers[markerid]
 
     return _iterencode
+
diff --git a/gluon/contrib/simplejson/ordered_dict.py b/gluon/contrib/simplejson/ordered_dict.py
index 87ad8882..fb9eaed5 100644
--- a/gluon/contrib/simplejson/ordered_dict.py
+++ b/gluon/contrib/simplejson/ordered_dict.py
@@ -117,3 +117,4 @@ class OrderedDict(dict, DictMixin):
 
     def __ne__(self, other):
         return not self == other
+
diff --git a/gluon/contrib/simplejson/scanner.py b/gluon/contrib/simplejson/scanner.py
index 54593a37..405a8a8d 100644
--- a/gluon/contrib/simplejson/scanner.py
+++ b/gluon/contrib/simplejson/scanner.py
@@ -3,6 +3,7 @@
 import re
 def _import_c_make_scanner():
     try:
+        raise ImportError # because assumes simplejson in path
         from simplejson._speedups import make_scanner
         return make_scanner
     except ImportError:
@@ -75,3 +76,4 @@ def py_make_scanner(context):
     return scan_once
 
 make_scanner = c_make_scanner or py_make_scanner
+