do-not-use-vendored-code.patch: Refreshed.

Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su>
This commit is contained in:
Alexander GQ Gerasiov 2019-01-29 00:53:47 +03:00
parent 5a91d930ed
commit ee3eb032ab

View file

@ -1,35 +1,17 @@
From: Eric Evans <eevans@debian.org> From: Eric Evans <eevans@debian.org>
Date: Sun, 29 Nov 2015 12:33:59 -0600 Date: Sun, 29 Nov 2015 12:33:59 -0600
Subject: do-not-use-vendored-code Subject: do-not-use-vendored-code
Last-Update: Tue, 29 Jan 2019 00:51:06 +0300
Upstream botocore includes a couple of vendored modules, and boto3 depends Upstream botocore includes a couple of vendored modules, and boto3 depends
on them transitively. The Debian package of botocore excludes this vendored on them transitively. The Debian package of botocore excludes this vendored
code, and includes dependencies for the corresponding packages, so we need code, and includes dependencies for the corresponding packages, so we need
to do the same, here. to do the same, here.
---
boto3/s3/transfer.py | 3 +--
tests/functional/test_dynamodb.py | 2 +-
tests/unit/s3/test_transfer.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
Index: python-boto3/tests/functional/test_dynamodb.py
=================================================================== --- a/boto3/compat.py
--- python-boto3.orig/tests/functional/test_dynamodb.py +++ b/boto3/compat.py
+++ python-boto3/tests/functional/test_dynamodb.py @@ -14,8 +14,7 @@
@@ -13,7 +13,7 @@
import json
from tests import unittest, mock
-from botocore.vendored import requests
+import requests
from boto3.session import Session
from boto3.dynamodb.conditions import Attr
Index: python-boto3/boto3/compat.py
===================================================================
--- python-boto3.orig/boto3/compat.py
+++ python-boto3/boto3/compat.py
@@ -14,8 +14,7 @@ import sys
import os import os
import errno import errno
import socket import socket