3 files changed, 0 insertions, 173 deletions
diff --git a/dev-python/moto/files/moto-1.3.14-newer-botocore.patch b/dev-python/moto/files/moto-1.3.14-newer-botocore.patch
deleted file mode 100644
index a12e38483362..000000000000
--- a/dev-python/moto/files/moto-1.3.14-newer-botocore.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit ef7fce5a4fcd951a6c2bd1b9c6d21e6cf6a711e2
-Author: gruebel <anton.gruebel@gmail.com>
-Date:   Thu Nov 21 22:35:20 2019 +0100
-
-    Fixed failing tests, due to a new required parameter StreamEnabled
-
-diff --git a/tests/test_dynamodbstreams/test_dynamodbstreams.py b/tests/test_dynamodbstreams/test_dynamodbstreams.py
-index 01cf915a..a98f97bf 100644
---- a/tests/test_dynamodbstreams/test_dynamodbstreams.py
-+++ b/tests/test_dynamodbstreams/test_dynamodbstreams.py
-@@ -213,7 +213,7 @@ class TestEdges:
-
-         resp = conn.update_table(
-             TableName="test-streams",
--            StreamSpecification={"StreamViewType": "KEYS_ONLY"},
-+            StreamSpecification={"StreamEnabled": True, "StreamViewType": "KEYS_ONLY"},
-         )
-         assert "StreamSpecification" in resp["TableDescription"]
-         assert resp["TableDescription"]["StreamSpecification"] == {
-@@ -226,7 +226,10 @@ class TestEdges:
-         with assert_raises(conn.exceptions.ResourceInUseException):
-             resp = conn.update_table(
-                 TableName="test-streams",
--                StreamSpecification={"StreamViewType": "OLD_IMAGES"},
-+                StreamSpecification={
-+                    "StreamEnabled": True,
-+                    "StreamViewType": "OLD_IMAGES",
-+                },
-             )
-
-     def test_stream_with_range_key(self):
-@@ -243,7 +246,7 @@ class TestEdges:
-                 {"AttributeName": "color", "AttributeType": "S"},
-             ],
-             ProvisionedThroughput={"ReadCapacityUnits": 1, "WriteCapacityUnits": 1},
--            StreamSpecification={"StreamViewType": "NEW_IMAGES"},
-+            StreamSpecification={"StreamEnabled": True, "StreamViewType": "NEW_IMAGES"},
-         )
-         stream_arn = resp["TableDescription"]["LatestStreamArn"]
-
-diff --git a/moto/core/responses.py b/moto/core/responses.py
-index bf4af902..c708edb8 100644
---- a/moto/core/responses.py
-+++ b/moto/core/responses.py
-@@ -307,7 +307,7 @@ class BaseResponse(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
-         def _convert(elem, is_last):
-             if not re.match("^{.*}$", elem):
-                 return elem
--            name = elem.replace("{", "").replace("}", "")
-+            name = elem.replace("{", "").replace("}", "").replace("+", "")
-             if is_last:
-                 return "(?P<%s>[^/]*)" % name
-             return "(?P<%s>.*)" % name
diff --git a/dev-python/moto/files/moto-1.3.14-py39.patch b/dev-python/moto/files/moto-1.3.14-py39.patch
deleted file mode 100644
index de00028179fa..000000000000
--- a/dev-python/moto/files/moto-1.3.14-py39.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From af66a281ee2bcc7cc6c48bb3c8d033d385c12875 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 14 Jun 2020 12:31:00 +0200
-Subject: [PATCH] Fix use of base64.decodestring() in tests
-
-Use base64.decodebytes() instead of deprecated/removed .decodestring()
-in test_user_data_with_run_instance().  Fixes tests on py3.9.
----
- tests/test_ec2/test_instances.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_ec2/test_instances.py b/tests/test_ec2/test_instances.py
-index 041bc8c8..1def1734 100644
---- a/tests/test_ec2/test_instances.py
-+++ b/tests/test_ec2/test_instances.py
-@@ -9,6 +9,7 @@ from nose.tools import assert_raises
- import base64
- import datetime
- import ipaddress
-+import sys
- 
- import six
- import boto
-@@ -765,7 +766,10 @@ def test_user_data_with_run_instance():
-     instance_attribute = instance.get_attribute("userData")
-     instance_attribute.should.be.a(InstanceAttribute)
-     retrieved_user_data = instance_attribute.get("userData").encode("utf-8")
--    decoded_user_data = base64.decodestring(retrieved_user_data)
-+    if sys.version_info[0] == 2:
-+        decoded_user_data = base64.decodestring(retrieved_user_data)
-+    else:
-+        decoded_user_data = base64.decodebytes(retrieved_user_data)
-     decoded_user_data.should.equal(b"some user data")
- 
- 
--- 
-2.27.0
-
diff --git a/dev-python/moto/files/moto-1.3.14-tests.patch b/dev-python/moto/files/moto-1.3.14-tests.patch
deleted file mode 100644
index 4fdbf801eec3..000000000000
--- a/dev-python/moto/files/moto-1.3.14-tests.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/tests/test_awslambda/test_lambda.py b/tests/test_awslambda/test_lambda.py
-index 306deeea..7b8937ab 100644
---- a/tests/test_awslambda/test_lambda.py
-+++ b/tests/test_awslambda/test_lambda.py
-@@ -22,6 +22,7 @@ from moto import (
-     settings,
-     mock_sqs,
- )
-+from unittest import skip
- from nose.tools import assert_raises
- from botocore.exceptions import ClientError
- 
-@@ -1024,6 +1025,7 @@ def test_create_event_source_mapping():
-     assert response["State"] == "Enabled"
- 
- 
-+@skip("fails in sandbox")
- @mock_logs
- @mock_lambda
- @mock_sqs
-@@ -1075,6 +1077,7 @@ def test_invoke_function_from_sqs():
-     assert False, "Test Failed"
- 
- 
-+@skip("fails in sandbox")
- @mock_logs
- @mock_lambda
- @mock_dynamodb2
-@@ -1135,6 +1138,7 @@ def test_invoke_function_from_dynamodb():
-     assert False, "Test Failed"
- 
- 
-+@skip("fails in sandbox")
- @mock_logs
- @mock_lambda
- @mock_sqs
-diff --git a/tests/test_cloudformation/test_validate.py b/tests/test_cloudformation/test_validate.py
-index 4dd4d7e0..3d1608e7 100644
---- a/tests/test_cloudformation/test_validate.py
-+++ b/tests/test_cloudformation/test_validate.py
-@@ -2,6 +2,7 @@ from collections import OrderedDict
- import json
- import yaml
- import os
-+from unittest import skip
- import boto3
- from nose.tools import raises
- import botocore
-@@ -46,6 +47,7 @@ dummy_template_json = json.dumps(json_template)
- dummy_bad_template_json = json.dumps(json_bad_template)
- 
- 
-+@skip("needs network access")
- @mock_cloudformation
- def test_boto3_json_validate_successful():
-     cf_conn = boto3.client("cloudformation", region_name="us-east-1")
-@@ -87,6 +89,7 @@ yaml_bad_template = """
- """
- 
- 
-+@skip("needs network access")
- @mock_cloudformation
- def test_boto3_yaml_validate_successful():
-     cf_conn = boto3.client("cloudformation", region_name="us-east-1")
-diff --git a/tests/test_core/test_request_mocking.py b/tests/test_core/test_request_mocking.py
-index 2c44d52c..38c3a08d 100644
---- a/tests/test_core/test_request_mocking.py
-+++ b/tests/test_core/test_request_mocking.py
-@@ -1,10 +1,13 @@
- import requests
- import sure  # noqa
- 
-+from unittest import skip
-+
- import boto3
- from moto import mock_sqs, settings
- 
- 
-+@skip("Needs network access")
- @mock_sqs
- def test_passthrough_requests():
-     conn = boto3.client("sqs", region_name="us-west-1")