[arch-commits] Commit in python-jsonpatch/repos (3 files)

[Felix Yan]

    Date: Sunday, December 25, 2016 @ 03:37:16
  Author: felixonmars
Revision: 201824

archrelease: copy trunk to community-staging-any

Added:
  python-jsonpatch/repos/community-staging-any/
  python-jsonpatch/repos/community-staging-any/PKGBUILD
    (from rev 201823, python-jsonpatch/trunk/PKGBUILD)
  python-jsonpatch/repos/community-staging-any/python3.6.patch
    (from rev 201823, python-jsonpatch/trunk/python3.6.patch)

-----------------+
 PKGBUILD        |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 python3.6.patch |   29 ++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

Copied: python-jsonpatch/repos/community-staging-any/PKGBUILD (from rev 201823, python-jsonpatch/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD	                        (rev 0)
+++ community-staging-any/PKGBUILD	2016-12-25 03:37:16 UTC (rev 201824)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Limao Luo <luolimao+AUR at gmail.com>
+
+pkgbase=python-jsonpatch
+_pkgname=jsonpatch
+pkgname=(python-jsonpatch python2-jsonpatch)
+pkgver=1.14
+pkgrel=2
+pkgdesc="An implementation of the JSON Patch format"
+arch=("any")
+url="https://github.com/stefankoegl/python-json-patch"
+license=("BSD")
+makedepends=("python-setuptools" "python2-setuptools" "python-jsonpointer" "python2-jsonpointer"
+             "python-pypandoc" "python2-pypandoc" "git")
+checkdepends=('python-coverage' 'python2-coverage')
+source=("git+https://github.com/stefankoegl/python-json-patch.git#tag=v$pkgver"
+        python3.6.patch)
+sha512sums=('SKIP'
+            'e6f536bf89002cbdce63828fbc9f37690cf23fddad3b300258766b18bd735fc9ac22f6cd3f8ecf59e79206721ca31b2867ab1518efb578d86f485a2d63b07fcc')
+
+prepare(){
+  (cd python-json-patch; patch -p1 -i ../python3.6.patch)
+
+  cp -a python-json-patch{,-py2}
+  find python-json-patch-py2 -name \*.py -exec sed -i '1s/python$/&2/' {} +
+}
+
+build() {
+  cd "$srcdir"/python-json-patch
+  python setup.py build
+
+  cd "$srcdir"/python-json-patch-py2
+  python2 setup.py build
+}
+
+check() {
+  cd "$srcdir"/python-json-patch
+  coverage run --source=jsonpatch tests.py
+
+  cd "$srcdir"/python-json-patch-py2
+  coverage2 run --source=jsonpatch tests.py
+}
+
+package_python-jsonpatch() {
+  depends=("python-jsonpointer")
+
+  cd "$srcdir"/python-json-patch
+
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  python setup.py install --prefix=/usr --root="$pkgdir"
+}
+package_python2-jsonpatch() {
+  depends=("python2-jsonpointer")
+
+  cd "$srcdir"/python-json-patch-py2
+
+  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  for _bin in "$pkgdir"/usr/bin/*; do
+    mv "$_bin"{,2}
+  done
+}

Copied: python-jsonpatch/repos/community-staging-any/python3.6.patch (from rev 201823, python-jsonpatch/trunk/python3.6.patch)
===================================================================
--- community-staging-any/python3.6.patch	                        (rev 0)
+++ community-staging-any/python3.6.patch	2016-12-25 03:37:16 UTC (rev 201824)
@@ -0,0 +1,29 @@
+From d6e9a0047bad780b53151f572ea257f1cb6ebe41 Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner at redhat.com>
+Date: Wed, 29 Jun 2016 11:13:00 +0200
+Subject: [PATCH] Use inspect.signature() on Python 3
+
+The inspect.getargspec() function has been deprecated in Python 3:
+https://docs.python.org/3/library/inspect.html#inspect.getargspec
+---
+ jsonpatch.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/jsonpatch.py b/jsonpatch.py
+index 32508e2..3c83f61 100644
+--- a/jsonpatch.py
++++ b/jsonpatch.py
+@@ -105,8 +105,11 @@ def get_loadjson():
+     function with object_pairs_hook set to multidict for Python versions that
+     support the parameter. """
+ 
+-    argspec = inspect.getargspec(json.load)
+-    if 'object_pairs_hook' not in argspec.args:
++    if sys.version_info >= (3, 3):
++        args = inspect.signature(json.load).parameters
++    else:
++        args = inspect.getargspec(json.load).args
++    if 'object_pairs_hook' not in args:
+         return json.load
+ 
+     return functools.partial(json.load, object_pairs_hook=multidict)