Merge branch 'release/1.10.3'

pavlov99 · Feb 2, 2016 · f35f16b · f35f16b
2 parents 114e01b + 8db3f5d
commit f35f16b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 35 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,15 +1,12 @@
-[report]
+[run]
 omit=
     jsonrpc/six.py
     jsonrpc/tests/*
 source=jsonrpc
-exclude_lines=
-    raise NotImplemented
 
-[run]
+[report]
 omit=
     jsonrpc/six.py
     jsonrpc/tests/*
-source=jsonrpc
 exclude_lines=
-    raise NotImplemented
+    raise NotImplementedError()
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,6 @@ python: "2.7"
 env:
     - TOXENV=py26
     - TOXENV=py27
-    - TOXENV=py32
     - TOXENV=py33
     - TOXENV=py34
     - TOXENV=pypy

diff --git a/README.rst b/README.rst
@@ -5,37 +5,20 @@ json-rpc
    :alt: Join the chat at https://gitter.im/pavlov99/json-rpc
    :target: https://gitter.im/pavlov99/json-rpc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
-.. image:: https://travis-ci.org/pavlov99/json-rpc.png
-    :target: https://travis-ci.org/pavlov99/json-rpc
+.. image:: https://travis-ci.org/pavlov99/json-rpc.png?branch=master
+    :target: https://travis-ci.org/pavlov99/json-rpc?branch=master
     :alt: Build Status
 
-.. image:: https://coveralls.io/repos/pavlov99/json-rpc/badge.png
-    :target: https://coveralls.io/r/pavlov99/json-rpc
+.. image:: https://coveralls.io/repos/pavlov99/json-rpc/badge.png?branch=master
+    :target: https://coveralls.io/r/pavlov99/json-rpc?branch=master
     :alt: Coverage Status
 
 .. image:: https://www.codacy.com/project/badge/34e0c2c696214041ae4fd5cfcb4af401
     :target: https://www.codacy.com/app/pavlov99/json-rpc
 
-.. image:: https://pypip.in/v/json-rpc/badge.png
-    :target: https://crate.io/packages/json-rpc
-    :alt: Version
-
-.. image:: https://pypip.in/d/json-rpc/badge.png
-    :target: https://crate.io/packages/json-rpc
-    :alt: Downloads
-
-.. image:: https://pypip.in/format/json-rpc/badge.png
-    :target: https://pypi.python.org/pypi/json-rpc/
-    :alt: Download format
-
-
-.. image:: https://pypip.in/license/json-rpc/badge.png
-    :target: https://pypi.python.org/pypi/json-rpc/
-    :alt: License
-
 
 `JSON-RPC2.0 <http://www.jsonrpc.org/specification>`_ and `JSON-RPC1.0 <http://json-rpc.org/wiki/specification>`_ transport specification implementation.
-Supports python2.6+, python3.2+, PyPy. Has optional Django and Flask support. 200+ tests.
+Supports python2.6+, python3.3+, PyPy. Has optional Django and Flask support. 200+ tests.
 
 Documentation: http://json-rpc.readthedocs.org
 
@@ -130,7 +113,7 @@ There are `several libraries <http://en.wikipedia.org/wiki/JSON-RPC#Implementati
 
 Testing
 -------
-json-rpc is python library, it supports pythons: 2.6, 2.7, 3.3, 3.4. There is optional support for django1.6 (python2.6 does not support django1.7).
+json-rpc is a python library, it supports pythons: 2.6, 2.7, 3.3, 3.4. There is optional support for django1.6 (python2.6 does not support django1.7).
 
 Contributors
 ------------
@@ -143,3 +126,6 @@ Contributors
 * Julian Hille `@julianhille <https://github.com/julianhille>`_
 * Pavel Evdokimov `@Santinell <https://github.com/Santinell>`_
 * Lev Orekhov `@lorehov <https://github.com/lorehov>`_
+* Sergey Nikitin `@nikitinsm <https://github.com/nikitinsm>`_
+* Jean-Christophe Bohin `@jcbohin <https://github.com/jcbohin>`_
+* arnuschky `@arnuschky <https://github.com/arnuschky>`_
diff --git a/changelog b/changelog
@@ -1,3 +1,8 @@
+2016-01-31  Kirill Pavlov <kirill.pavlov@phystech.edu>
+
+	* Drop support of python 3.2. Pip does not support it, which leads to
+	tests fail
+
 2015-08-07  Kirill Pavlov <kirill.pavlov@liricco.com>
 
 	* Allow custom empty dispatcher parameter for backend-specific api
@@ -36,7 +41,7 @@
 	* Add custom json serializer (based on json) with datetime.Datetime
 	and decimal.Decimal serialization support.
 	* Move JSONRPC* classes to JSONRPC20*, as far as there is JSONRPC10*.
-	* Add dispatcher and JSONPRCManager to jsonrpc/__init__, they are no
+	* Add dispatcher and JSONRPCManager to jsonrpc/__init__, they are no
 	longer in jsonrpc.jsonrpc module.
 
 2013-10-13  Kirill Pavlov <kirill.pavlov@phystech.edu>

diff --git a/jsonrpc/__init__.py b/jsonrpc/__init__.py
@@ -1,4 +1,4 @@
-__version = (1, 10, 2)
+__version = (1, 10, 3)
 
 __version__ = version = '.'.join(map(str, __version))
 __project__ = PROJECT = __name__

diff --git a/jsonrpc/backend/django.py b/jsonrpc/backend/django.py
@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+from django.views.decorators.csrf import csrf_exempt
 from django.conf.urls import url
 from django.http import HttpResponse, HttpResponseNotAllowed
 import copy
@@ -31,6 +32,7 @@ def urls(self):
 
         return urls
 
+    @csrf_exempt
     def jsonrpc(self, request):
         """ JSON-RPC 2.0 handler."""
         if request.method != "POST":

diff --git a/setup.py b/setup.py
@@ -44,7 +44,6 @@ def read(fname):
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: Implementation :: PyPy",

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, pypy, pep8, cov
+envlist = py26, py27, py33, py34, pypy, pep8, cov
 
 [testenv]
 commands = nosetests
@@ -25,7 +25,7 @@ commands = pylama --linters=pep8,pep257,mccabe,pyflakes,pylint jsonrpc
 
 [testenv:cov]
 deps =
-    coverage
+    coverage==4.0.3
     {[testenv]deps}
 
 commands =