Permalink
Browse files

Vendor simplejson and ensure it is on the path

  • Loading branch information...
1 parent 3aa50a7 commit 75ece4be1dd3228414c78d1f13fe20dbd410083c @tnm committed Jul 9, 2012
Showing with 7,106 additions and 4 deletions.
  1. +5 −3 lib/pygments/mentos.py
  2. +1 −1 test/test_pygments.rb
  3. +10 −0 vendor/simplejson/.gitignore
  4. +5 −0 vendor/simplejson/.travis.yml
  5. +291 −0 vendor/simplejson/CHANGES.txt
  6. +19 −0 vendor/simplejson/LICENSE.txt
  7. +5 −0 vendor/simplejson/MANIFEST.in
  8. +19 −0 vendor/simplejson/README.rst
  9. +179 −0 vendor/simplejson/conf.py
  10. +628 −0 vendor/simplejson/index.rst
  11. +18 −0 vendor/simplejson/scripts/make_docs.py
  12. +104 −0 vendor/simplejson/setup.py
  13. +510 −0 vendor/simplejson/simplejson/__init__.py
  14. +2,745 −0 vendor/simplejson/simplejson/_speedups.c
  15. +425 −0 vendor/simplejson/simplejson/decoder.py
  16. +567 −0 vendor/simplejson/simplejson/encoder.py
  17. +119 −0 vendor/simplejson/simplejson/ordered_dict.py
  18. +77 −0 vendor/simplejson/simplejson/scanner.py
  19. +67 −0 vendor/simplejson/simplejson/tests/__init__.py
  20. +55 −0 vendor/simplejson/simplejson/tests/test_bigint_as_string.py
  21. +30 −0 vendor/simplejson/simplejson/tests/test_check_circular.py
  22. +66 −0 vendor/simplejson/simplejson/tests/test_decimal.py
  23. +83 −0 vendor/simplejson/simplejson/tests/test_decode.py
  24. +9 −0 vendor/simplejson/simplejson/tests/test_default.py
  25. +67 −0 vendor/simplejson/simplejson/tests/test_dump.py
  26. +46 −0 vendor/simplejson/simplejson/tests/test_encode_basestring_ascii.py
  27. +32 −0 vendor/simplejson/simplejson/tests/test_encode_for_html.py
  28. +34 −0 vendor/simplejson/simplejson/tests/test_errors.py
  29. +91 −0 vendor/simplejson/simplejson/tests/test_fail.py
  30. +19 −0 vendor/simplejson/simplejson/tests/test_float.py
  31. +86 −0 vendor/simplejson/simplejson/tests/test_indent.py
  32. +20 −0 vendor/simplejson/simplejson/tests/test_item_sort_key.py
  33. +121 −0 vendor/simplejson/simplejson/tests/test_namedtuple.py
  34. +76 −0 vendor/simplejson/simplejson/tests/test_pass1.py
  35. +14 −0 vendor/simplejson/simplejson/tests/test_pass2.py
  36. +20 −0 vendor/simplejson/simplejson/tests/test_pass3.py
  37. +67 −0 vendor/simplejson/simplejson/tests/test_recursion.py
  38. +117 −0 vendor/simplejson/simplejson/tests/test_scanstring.py
  39. +42 −0 vendor/simplejson/simplejson/tests/test_separators.py
  40. +20 −0 vendor/simplejson/simplejson/tests/test_speedups.py
  41. +49 −0 vendor/simplejson/simplejson/tests/test_tuple.py
  42. +109 −0 vendor/simplejson/simplejson/tests/test_unicode.py
  43. +39 −0 vendor/simplejson/simplejson/tool.py
View
@@ -2,6 +2,11 @@
# -*- coding: utf-8 -*-
import sys, re, os, signal
+import sys
+if 'PYGMENTS_PATH' in os.environ:
+ sys.path.insert(0, os.environ['PYGMENTS_PATH'])
+sys.path.append(os.getcwd() + "/vendor/")
+
import pygments
from pygments import lexers, formatters, styles, filters
@@ -10,9 +15,6 @@
except ImportError:
import simplejson as json
-if 'PYGMENTS_PATH' in os.environ:
- sys.path.insert(0, os.environ['PYGMENTS_PATH'])
-
def _signal_handler(signal, frame):
"""
Handle the signal given in the first argument, exiting gracefully
View
@@ -198,7 +198,7 @@ def test_css_default
end
def test_css_colorful
- assert_match '.c { color: #808080 }', P.css(:style => 'colorful')
+ assert_match '.c { color: #888888 }', P.css(:style => 'colorful')
end
end
@@ -0,0 +1,10 @@
+*.egg-info
+*.egg
+*.pyc
+*.so
+/MANIFEST
+/.coverage
+/coverage.xml
+/build
+/dist
+/docs
@@ -0,0 +1,5 @@
+language: python
+python:
+ - "2.6"
+ - "2.7"
+script: python setup.py test
@@ -0,0 +1,291 @@
+Version 2.6.0 released 2012-06-26
+
+* Error messages changed to match proposal for Python 3.3.1
+ http://bugs.python.org/issue5067
+
+Version 2.5.2 released 2012-05-10
+
+* Fix for regression introduced in 2.5.1
+ https://github.com/simplejson/simplejson/issues/35
+
+Version 2.5.1 released 2012-05-10
+
+* Support for use_decimal=True in environments that use Python
+ sub-interpreters such as uWSGI
+ https://github.com/simplejson/simplejson/issues/34
+
+Version 2.5.0 released 2012-03-29
+
+* New item_sort_key option for encoder to allow fine grained control of sorted
+ output
+
+Version 2.4.0 released 2012-03-06
+
+* New bigint_as_string option for encoder to trade JavaScript number precision
+ issues for type issues.
+ https://github.com/simplejson/simplejson/issues/31
+
+Version 2.3.3 released 2012-02-27
+
+* Allow unknown numerical types for indent parameter
+ https://github.com/simplejson/simplejson/pull/29
+
+Version 2.3.2 released 2011-12-30
+
+* Fix crashing regression in speedups introduced in 2.3.1
+
+Version 2.3.1 released 2011-12-29
+
+* namedtuple_as_object now checks _asdict to ensure that it
+ is callable.
+ https://github.com/simplejson/simplejson/issues/26
+
+Version 2.3.0 released 2011-12-05
+
+* Any objects with _asdict() methods are now considered for
+ namedtuple_as_object.
+ https://github.com/simplejson/simplejson/pull/22
+
+Version 2.2.1 released 2011-09-06
+
+* Fix MANIFEST.in issue when building a sdist from a sdist.
+ https://github.com/simplejson/simplejson/issues/16
+
+Version 2.2.0 released 2011-09-04
+
+* Remove setuptools requirement, reverted to pure distutils
+* use_decimal default for encoding (dump, dumps, JSONEncoder) is now True
+* tuple encoding as JSON objects can be turned off with new
+ tuple_as_array=False option.
+ https://github.com/simplejson/simplejson/pull/6
+* namedtuple (or other tuple subclasses with _asdict methods) are now
+ encoded as JSON objects rather than arrays by default. Can be disabled
+ and treated as a tuple with the new namedtuple_as_object=False option.
+ https://github.com/simplejson/simplejson/pull/6
+* JSONDecodeError is now raised instead of ValueError when a document
+ ends with an opening quote and the C speedups are in use.
+ https://github.com/simplejson/simplejson/issues/15
+* Updated documentation with information about JSONDecodeError
+* Force unicode linebreak characters to be escaped (U+2028 and U+2029)
+ http://timelessrepo.com/json-isnt-a-javascript-subset
+* Moved documentation from a git submodule to
+ http://simplejson.readthedocs.org/
+
+Version 2.1.6 released 2011-05-08
+
+* Prevent segfaults with deeply nested JSON documents
+ https://github.com/simplejson/simplejson/issues/11
+* Fix compatibility with Python 2.5
+ https://github.com/simplejson/simplejson/issues/5
+
+Version 2.1.5 released 2011-04-17
+
+* Built sdist tarball with setuptools_git installed. Argh.
+
+Version 2.1.4 released 2011-04-17
+
+* Does not try to build the extension when using PyPy
+* Trailing whitespace after commas no longer emitted when indent is used
+* Migrated to github http://github.com/simplejson/simplejson
+
+Version 2.1.3 released 2011-01-17
+
+* Support the sort_keys option in C encoding speedups
+ http://code.google.com/p/simplejson/issues/detail?id=86
+* Allow use_decimal to work with dump()
+ http://code.google.com/p/simplejson/issues/detail?id=87
+
+Version 2.1.2 released 2010-11-01
+
+* Correct wrong end when object_pairs_hook is used
+ http://code.google.com/p/simplejson/issues/detail?id=85
+* Correct output for indent=0
+ http://bugs.python.org/issue10019
+* Correctly raise TypeError when non-string keys are used with speedups
+ http://code.google.com/p/simplejson/issues/detail?id=82
+* Fix the endlineno, endcolno attributes of the JSONDecodeError exception.
+ http://code.google.com/p/simplejson/issues/detail?id=81
+
+Version 2.1.1 released 2010-03-31
+
+* Change how setup.py imports ez_setup.py to try and workaround old versions
+ of setuptools.
+ http://code.google.com/p/simplejson/issues/detail?id=75
+* Fix compilation on Windows platform (and other platforms with very
+ picky compilers)
+* Corrected simplejson.__version__ and other minor doc changes.
+* Do not fail speedups tests if speedups could not be built.
+ http://code.google.com/p/simplejson/issues/detail?id=73
+
+Version 2.1.0 released 2010-03-10
+
+* Decimal serialization officially supported for encoding with
+ use_decimal=True. For encoding this encodes Decimal objects and
+ for decoding it implies parse_float=Decimal
+* Python 2.4 no longer supported (may still work, but no longer tested)
+* Decoding performance and memory utilization enhancements
+ http://bugs.python.org/issue7451
+* JSONEncoderForHTML class for escaping &, <, >
+ http://code.google.com/p/simplejson/issues/detail?id=66
+* Memoization of object keys during encoding (when using speedups)
+* Encoder changed to use PyIter_Next for list iteration to avoid
+ potential threading issues
+* Encoder changed to use iteritems rather than PyDict_Next in order to
+ support dict subclasses that have a well defined ordering
+ http://bugs.python.org/issue6105
+* indent encoding parameter changed to be a string rather than an integer
+ (integer use still supported for backwards compatibility)
+ http://code.google.com/p/simplejson/issues/detail?id=56
+* Test suite (python setup.py test) now automatically runs with and without
+ speedups
+ http://code.google.com/p/simplejson/issues/detail?id=55
+* Fixed support for older versions of easy_install (e.g. stock Mac OS X config)
+ http://code.google.com/p/simplejson/issues/detail?id=54
+* Fixed str/unicode mismatches when using ensure_ascii=False
+ http://code.google.com/p/simplejson/issues/detail?id=48
+* Fixed error message when parsing an array with trailing comma with speedups
+ http://code.google.com/p/simplejson/issues/detail?id=46
+* Refactor decoder errors to raise JSONDecodeError instead of ValueError
+ http://code.google.com/p/simplejson/issues/detail?id=45
+* New ordered_pairs_hook feature in decoder which makes it possible to
+ preserve key order. http://bugs.python.org/issue5381
+* Fixed containerless unicode float decoding (same bug as 2.0.4, oops!)
+ http://code.google.com/p/simplejson/issues/detail?id=43
+* Share PosInf definition between encoder and decoder
+* Minor reformatting to make it easier to backport simplejson changes
+ to Python 2.7/3.1 json module
+
+Version 2.0.9 released 2009-02-18
+
+* Adds cyclic GC to the Encoder and Scanner speedups, which could've
+ caused uncollectible cycles in some cases when using custom parser
+ or encoder functions
+
+Version 2.0.8 released 2009-02-15
+
+* Documentation fixes
+* Fixes encoding True and False as keys
+* Fixes checking for True and False by identity for several parameters
+
+Version 2.0.7 released 2009-01-04
+
+* Documentation fixes
+* C extension now always returns unicode strings when the input string is
+ unicode, even for empty strings
+
+Version 2.0.6 released 2008-12-19
+
+* Windows build fixes
+
+Version 2.0.5 released 2008-11-23
+
+* Fixes a segfault in the C extension when using check_circular=False and
+ encoding an invalid document
+
+Version 2.0.4 released 2008-10-24
+
+* Fixes a parsing error in the C extension when the JSON document is (only)
+ a floating point number. It would consume one too few characters in that
+ case, and claim the document invalid.
+
+Version 2.0.3 released 2008-10-11
+
+* Fixes reference leaks in the encoding speedups (sorry about that!)
+* Fixes doctest suite for Python 2.6
+* More optimizations for the decoder
+
+Version 2.0.2 released 2008-10-06
+
+* Fixes MSVC2003 build regression
+* Fixes Python 2.4 compatibility in _speedups.c
+
+Version 2.0.1 released 2008-09-29
+
+* Fixes long encoding regression introduced in 2.0.0
+* Fixes MinGW build regression introduced in 2.0.0
+
+Version 2.0.0 released 2008-09-27
+
+* optimized Python encoding path
+* optimized Python decoding path
+* optimized C encoding path
+* optimized C decoding path
+* switched to sphinx docs (nearly the same as the json module in python 2.6)
+
+Version 1.9.3 released 2008-09-23
+
+* Decoding is significantly faster (for our internal benchmarks)
+* Pretty-printing tool changed from simplejson to simplejson.tool for better
+ Python 2.6 comaptibility
+* Misc. bug fixes
+
+Version 1.9 released 2008-05-03
+
+* Rewrote test suite with unittest and doctest (no more nosetest dependency)
+* Better PEP 7 and PEP 8 source compliance
+* Removed simplejson.jsonfilter demo module
+* simplejson.jsonfilter is no longer included
+
+Version 1.8.1 released 2008-03-24
+
+* Optional C extension for accelerating the decoding of JSON strings
+* Command line interface for pretty-printing JSON (via python -msimplejson)
+* Decoding of integers and floats is now extensible (e.g. to use Decimal) via
+ parse_int, parse_float options.
+* Subversion and issue tracker moved to google code:
+ http://code.google.com/p/simplejson/
+* "/" is no longer escaped, so if you're embedding JSON directly in HTML
+ you'll want to use .replace("/", "\\/") to prevent a close-tag attack.
+
+Version 1.7 released 2007-03-18
+
+* Improves encoding performance with an optional C extension to speed up
+ str/unicode encoding (by 10-150x or so), which yields an overall speed
+ boost of 2x+ (JSON is string-heavy).
+* Support for encoding unicode code points outside the BMP to UTF-16
+ surrogate code pairs (specified by the Strings section of RFC 4627).
+
+Version 1.6 released 2007-03-03
+
+* Improved str support for encoding. Previous versions of simplejson
+ integrated strings directly into the output stream, this version ensures
+ they're of a particular encoding (default is UTF-8) so that the output
+ stream is valid.
+
+Version 1.5 released 2007-01-18
+
+* Better Python 2.5 compatibility
+* Better Windows compatibility
+* indent encoding parameter for pretty printing
+* separators encoding parameter for generating optimally compact JSON
+
+Version 1.3 released 2006-04-01
+
+* The optional object_hook function is called upon decoding of any JSON
+ object literal, and its return value is used instead of the dict that
+ would normally be used. This can be used to efficiently implement
+ features such as JSON-RPC class hinting, or other custom decodings of
+ JSON. See the documentation for more information.
+
+Version 1.1 released 2005-12-31
+
+* Renamed from simple_json to simplejson to comply with PEP 8 module naming
+ guidelines
+* Full set of documentation
+* More tests
+* The encoder and decoder have been extended to understand NaN, Infinity, and
+ -Infinity (but this can be turned off via allow_nan=False for strict JSON
+ compliance)
+* The decoder's scanner has been fixed so that it no longer accepts invalid
+ JSON documents
+* The decoder now reports line and column information as well as character
+ numbers for easier debugging
+* The encoder now has a circular reference checker, which can be optionally
+ disabled with check_circular=False
+* dump, dumps, load, loads now accept an optional cls kwarg to use an
+ alternate JSONEncoder or JSONDecoder class for convenience.
+* The read/write compatibility shim for json-py now have deprecation warnings
+
+Version 1.0 released 2005-12-25
+
+ * Initial release
@@ -0,0 +1,19 @@
+Copyright (c) 2006 Bob Ippolito
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -0,0 +1,5 @@
+include *.py
+include *.txt
+include *.rst
+include scripts/*.py
+include MANIFEST.in
@@ -0,0 +1,19 @@
+simplejson is a simple, fast, complete, correct and extensible
+JSON <http://json.org> encoder and decoder for Python 2.5+. It is
+pure Python code with no dependencies, but includes an optional C
+extension for a serious speed boost.
+
+The latest documentation for simplejson can be read online here:
+http://simplejson.readthedocs.org/
+
+simplejson is the externally maintained development version of the
+json library included with Python 2.6 and Python 3.0, but maintains
+backwards compatibility with Python 2.5.
+
+The encoder may be subclassed to provide serialization in any kind of
+situation, without any special support by the objects to be serialized
+(somewhat like pickle).
+
+The decoder can handle incoming JSON strings of any specified encoding
+(UTF-8 by default).
+
Oops, something went wrong.

0 comments on commit 75ece4b

Please sign in to comment.