summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNico Revin <whois@nicorevin.ru>2014-08-03 12:33:56 +0400
committerNico Revin <whois@nicorevin.ru>2014-08-03 12:33:56 +0400
commit5804658ebb8812a542943b75e293a19beaae3ecc (patch)
treeee1c7ef6e6024fccef8df6ef649f9f1ebe75a48b /tests
parent6ff525e9e5aef8c24da2a79a7e6fe428b7a7edbc (diff)
downloadboto-5804658ebb8812a542943b75e293a19beaae3ecc.tar.gz
Remove redundant __future__ imports
See https://docs.python.org/2/reference/simple_stmts.html#future
Diffstat (limited to 'tests')
-rw-r--r--tests/integration/dynamodb2/test_highlevel.py2
-rw-r--r--tests/integration/ses/test_connection.py2
-rw-r--r--tests/integration/sns/test_connection.py2
-rw-r--r--tests/integration/sqs/test_bigmessage.py8
-rw-r--r--tests/unit/emr/test_connection.py2
-rw-r--r--tests/unit/s3/test_key.py2
-rw-r--r--tests/unit/test_connection.py8
7 files changed, 6 insertions, 20 deletions
diff --git a/tests/integration/dynamodb2/test_highlevel.py b/tests/integration/dynamodb2/test_highlevel.py
index 90771422..0f893b14 100644
--- a/tests/integration/dynamodb2/test_highlevel.py
+++ b/tests/integration/dynamodb2/test_highlevel.py
@@ -23,8 +23,6 @@
"""
Tests for DynamoDB v2 high-level abstractions.
"""
-from __future__ import with_statement
-
import os
import time
diff --git a/tests/integration/ses/test_connection.py b/tests/integration/ses/test_connection.py
index f1d66e8c..83b99944 100644
--- a/tests/integration/ses/test_connection.py
+++ b/tests/integration/ses/test_connection.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
from tests.unit import unittest
from boto.ses.connection import SESConnection
diff --git a/tests/integration/sns/test_connection.py b/tests/integration/sns/test_connection.py
index e5af487e..6a359b1b 100644
--- a/tests/integration/sns/test_connection.py
+++ b/tests/integration/sns/test_connection.py
@@ -19,8 +19,6 @@
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-from __future__ import with_statement
-
from tests.compat import mock, unittest
from boto.compat import http_client
from boto.sns import connect_to_region
diff --git a/tests/integration/sqs/test_bigmessage.py b/tests/integration/sqs/test_bigmessage.py
index ce1e983d..bb52dde1 100644
--- a/tests/integration/sqs/test_bigmessage.py
+++ b/tests/integration/sqs/test_bigmessage.py
@@ -24,8 +24,6 @@
"""
Some unit tests for the SQSConnection
"""
-from __future__ import with_statement
-
import time
from threading import Timer
from tests.unit import unittest
@@ -42,7 +40,7 @@ class TestBigMessage(unittest.TestCase):
def test_1_basic(self):
c = boto.connect_sqs()
-
+
# create a queue so we can test BigMessage
queue_name = 'test%d' % int(time.time())
timeout = 60
@@ -61,7 +59,7 @@ class TestBigMessage(unittest.TestCase):
fp = StringIO(msg_body)
s3_url = 's3://%s' % queue_name
message = queue.new_message(fp, s3_url=s3_url)
-
+
queue.write(message)
time.sleep(30)
@@ -69,7 +67,7 @@ class TestBigMessage(unittest.TestCase):
# Make sure msg body is in bucket
self.assertTrue(bucket.lookup(s3_object_name))
-
+
m = queue.read()
self.assertEqual(m.get_body().decode('utf-8'), msg_body)
diff --git a/tests/unit/emr/test_connection.py b/tests/unit/emr/test_connection.py
index 510f0c1f..5badd6ad 100644
--- a/tests/unit/emr/test_connection.py
+++ b/tests/unit/emr/test_connection.py
@@ -19,8 +19,6 @@
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
-from __future__ import with_statement
-
import boto.utils
from datetime import datetime
diff --git a/tests/unit/s3/test_key.py b/tests/unit/s3/test_key.py
index ee8b686a..7752d9cd 100644
--- a/tests/unit/s3/test_key.py
+++ b/tests/unit/s3/test_key.py
@@ -20,8 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
-from __future__ import with_statement
-
from tests.compat import mock, unittest
from tests.unit import AWSMockServiceTestCase
diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py
index 5d726e06..3d4a57b3 100644
--- a/tests/unit/test_connection.py
+++ b/tests/unit/test_connection.py
@@ -19,8 +19,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
-from __future__ import with_statement
-
import os
import socket
@@ -116,7 +114,7 @@ class TestAWSAuthConnection(unittest.TestCase):
self.assertEqual(conn.get_path('/folder//image.jpg'), '/folder//image.jpg')
self.assertEqual(conn.get_path('/folder////image.jpg'), '/folder////image.jpg')
self.assertEqual(conn.get_path('///folder////image.jpg'), '///folder////image.jpg')
-
+
def test_connection_behind_proxy(self):
os.environ['http_proxy'] = "http://john.doe:p4ssw0rd@127.0.0.1:8180"
conn = AWSAuthConnection(
@@ -130,7 +128,7 @@ class TestAWSAuthConnection(unittest.TestCase):
self.assertEqual(conn.proxy_pass, 'p4ssw0rd')
self.assertEqual(conn.proxy_port, '8180')
del os.environ['http_proxy']
-
+
def test_connection_behind_proxy_without_explicit_port(self):
os.environ['http_proxy'] = "http://127.0.0.1"
conn = AWSAuthConnection(
@@ -139,7 +137,7 @@ class TestAWSAuthConnection(unittest.TestCase):
aws_secret_access_key='secret',
suppress_consec_slashes=False,
port=8180
- )
+ )
self.assertEqual(conn.proxy, '127.0.0.1')
self.assertEqual(conn.proxy_port, 8180)
del os.environ['http_proxy']