From 2ecb04d6e07e4f5835bc0e3a0a2e01d44cfc0148 Mon Sep 17 00:00:00 2001
From: Steve Pulec <spulec@gmail.com>
Date: Wed, 18 Apr 2018 16:15:47 -0400
Subject: [PATCH] Revert errant change to S3 urls in
 cd1c6d3e6c3c80bf55fbfd6a657ba642c6fb4e3f.

---
 moto/s3/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/moto/s3/urls.py b/moto/s3/urls.py
index af0a9954..1d439a54 100644
--- a/moto/s3/urls.py
+++ b/moto/s3/urls.py
@@ -21,7 +21,7 @@ url_paths = {
     '{0}/$': S3ResponseInstance.bucket_response,
 
     # subdomain key of path-based bucket
-    '{0}/(?P<key_or_bucket_name>[^/?]+)/?$': S3ResponseInstance.ambiguous_response,
+    '{0}/(?P<key_or_bucket_name>[^/]+)/?$': S3ResponseInstance.ambiguous_response,
     # path-based bucket + key
-    '{0}/(?P<bucket_name_path>[^/?]+)/(?P<key_name>.+)': S3ResponseInstance.key_response,
+    '{0}/(?P<bucket_name_path>[^/]+)/(?P<key_name>.+)': S3ResponseInstance.key_response,
 }