Date: Thursday, October 10, 2019 @ 02:48:02 Author: yan12125 Revision: 514400
upgpkg: python-aws-xray-sdk 2.4.2-4 * The Pynamodb 4 PR [1] is merged, use that [1] https://github.com/aws/aws-xray-sdk-python/pull/177 Modified: python-aws-xray-sdk/trunk/PKGBUILD Deleted: python-aws-xray-sdk/trunk/aws-xray-sdk-pynamodb4.patch ------------------------------+ PKGBUILD | 6 +++--- aws-xray-sdk-pynamodb4.patch | 24 ------------------------ 2 files changed, 3 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-10 02:42:30 UTC (rev 514399) +++ PKGBUILD 2019-10-10 02:48:02 UTC (rev 514400) @@ -4,7 +4,7 @@ pkgname=python-aws-xray-sdk _pkgname=aws-xray-sdk-python pkgver=2.4.2 -pkgrel=3 +pkgrel=4 pkgdesc='AWS X-Ray SDK for Python' arch=(any) url='https://github.com/aws/aws-xray-sdk-python' @@ -17,10 +17,10 @@ # Not using PyPI source tarball as it does not include tests source=("https://github.com/aws/aws-xray-sdk-python/archive/$pkgver/$pkgname-$pkgver.tar.gz"; "aws-xray-sdk-psycopg2.8.patch"::"https://github.com/aws/aws-xray-sdk-python/commit/4b4422a3ad9bb9a28399b34851dd574f6155bb66.patch"; - "aws-xray-sdk-pynamodb4.patch") + "aws-xray-sdk-pynamodb4.patch"::"https://github.com/aws/aws-xray-sdk-python/commit/1dd185ba2fb946cea711a9620f04516c7f6eecdf.patch";) sha256sums=('e480a6dc21d314faf6a9af4cf871fd7b782fae1e704e0fe5977161707f101374' 'b0740901e4c3bd0a678b217b1121c5f827e8535722a560d9f84fb9a8b90f8f74' - 'e894f6c30b00126cbf2023fdef5c774827a99e8450d4c79e8abfdabed2d2868b') + 'c2ad5a109841600d271c0b4b49b0fb2b54bcac6e220bf6a7c4cd6f68e17f377e') prepare() { cd $_pkgname-$pkgver Deleted: aws-xray-sdk-pynamodb4.patch =================================================================== --- aws-xray-sdk-pynamodb4.patch 2019-10-10 02:42:30 UTC (rev 514399) +++ aws-xray-sdk-pynamodb4.patch 2019-10-10 02:48:02 UTC (rev 514400) @@ -1,24 +0,0 @@ -diff --git a/aws_xray_sdk/ext/pynamodb/patch.py b/aws_xray_sdk/ext/pynamodb/patch.py -index 8815cc3..a5e462f 100644 ---- a/aws_xray_sdk/ext/pynamodb/patch.py -+++ b/aws_xray_sdk/ext/pynamodb/patch.py -@@ -16,8 +16,8 @@ def patch(): - setattr(botocore.vendored.requests.sessions, '_xray_enabled', True) - - wrapt.wrap_function_wrapper( -- 'botocore.vendored.requests.sessions', -- 'Session.send', -+ 'botocore.httpsession', -+ 'URLLib3Session.send', - _xray_traced_pynamodb, - ) - -@@ -59,7 +59,7 @@ def pynamodb_meta_processor(wrapped, instance, args, kwargs, return_value, - subsegment.add_error_flag() - subsegment.add_exception(exception, stack, True) - -- resp = return_value.json() if return_value else None -+ resp = json.loads(return_value.text) if return_value else None - _extract_whitelisted_params(subsegment.name, operation_name, aws_meta, - [None, json.loads(args[0].body.decode('utf-8'))], - None, resp)
