Remove unnecessary print_function imports

boto/connection.py

@@ -42,7 +42,7 @@
 """
 Handles basic connections to AWS
 """
-from __future__ import print_function, with_statement
+from __future__ import with_statement
 
 import base64
 from datetime import datetime

boto/ec2/buyreservation.py

@@ -18,8 +18,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 print_function
-
 import boto.ec2
 from boto.sdb.db.property import StringProperty, IntegerProperty
 from boto.manage import propget

boto/ec2/reservedinstance.py

@@ -18,8 +18,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 print_function
-
 from boto.resultset import ResultSet
 from boto.ec2.ec2object import EC2Object
 from boto.utils import parse_ts

boto/gs/resumable_upload_handler.py

@@ -18,8 +18,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 print_function
-
 import errno
 import httplib
 import os
@@ -104,15 +102,15 @@ def _load_tracker_uri_from_file(self):
             # is attempted on a file), but warn user for other errors.
             if e.errno != errno.ENOENT:
                 # Will restart because self.tracker_uri is None.
-                print(('Couldn\'t read URI tracker file (%s): %s. Restarting '
+                print('Couldn\'t read URI tracker file (%s): %s. Restarting '
                       'upload from scratch.' %
-                      (self.tracker_file_name, e.strerror)))
+                      (self.tracker_file_name, e.strerror))
         except InvalidUriError as e:
             # Warn user, but proceed (will restart because
             # self.tracker_uri is None).
-            print(('Invalid tracker URI (%s) found in URI tracker file '
+            print('Invalid tracker URI (%s) found in URI tracker file '
                   '(%s). Restarting upload from scratch.' %
-                  (uri, self.tracker_file_name)))
+                  (uri, self.tracker_file_name))
         finally:
             if f:
                 f.close()
@@ -532,19 +530,19 @@ def _check_final_md5(self, key, etag):
     def handle_resumable_upload_exception(self, e, debug):
         if (e.disposition == ResumableTransferDisposition.ABORT_CUR_PROCESS):
             if debug >= 1:
-                print(('Caught non-retryable ResumableUploadException (%s); '
-                      'aborting but retaining tracker file' % e.message))
+                print('Caught non-retryable ResumableUploadException (%s); '
+                      'aborting but retaining tracker file' % e.message)
             raise
         elif (e.disposition == ResumableTransferDisposition.ABORT):
             if debug >= 1:
-                print(('Caught non-retryable ResumableUploadException (%s); '
-                      'aborting and removing tracker file' % e.message))
+                print('Caught non-retryable ResumableUploadException (%s); '
+                      'aborting and removing tracker file' % e.message)
             self._remove_tracker_file()
             raise
         else:
             if debug >= 1:
-                print(('Caught ResumableUploadException (%s) - will retry' %
-                      e.message))
+                print('Caught ResumableUploadException (%s) - will retry' %
+                      e.message)
 
     def track_progress_less_iterations(self, server_had_bytes_before_attempt,
                                        roll_back_md5=True, debug=0):
@@ -568,9 +566,9 @@ def track_progress_less_iterations(self, server_had_bytes_before_attempt,
         # Use binary exponential backoff to desynchronize client requests.
         sleep_time_secs = random.random() * (2**self.progress_less_iterations)
         if debug >= 1:
-            print(('Got retryable failure (%d progress-less in a row).\n'
+            print('Got retryable failure (%d progress-less in a row).\n'
                    'Sleeping %3.1f seconds before re-trying' %
-                   (self.progress_less_iterations, sleep_time_secs)))
+                   (self.progress_less_iterations, sleep_time_secs))
         time.sleep(sleep_time_secs)
 
     def send_file(self, key, fp, headers, cb=None, num_cb=10, hash_algs=None):
@@ -669,7 +667,7 @@ def send_file(self, key, fp, headers, cb=None, num_cb=10, hash_algs=None):
                 return
             except self.RETRYABLE_EXCEPTIONS as e:
                 if debug >= 1:
-                    print(('Caught exception (%s)' % e.__repr__()))
+                    print('Caught exception (%s)' % e.__repr__())
                 if isinstance(e, IOError) and e.errno == errno.EPIPE:
                     # Broken pipe error causes httplib to immediately
                     # close the socket (http://bugs.python.org/issue5542),

boto/manage/cmdshell.py

@@ -18,8 +18,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 print_function
-
 from boto.mashups.interactive import interactive_shell
 import boto
 import os

boto/manage/propget.py

@@ -18,8 +18,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 print_function
-
 
 def get(prop, choices=None):
     prompt = prop.verbose_name

boto/manage/server.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 print_function
-
 """
 High-level abstraction of an EC2 server
 """

boto/manage/test_manage.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from boto.manage.server import Server
 from boto.manage.volume import Volume
 import time

boto/mashups/iobject.py

@@ -18,8 +18,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 print_function
-
 import os
 
 def int_val_fn(v):

boto/mashups/order.py

@@ -18,8 +18,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 print_function
-
 """
 High-level abstraction of an EC2 order for servers
 """

boto/mashups/server.py

@@ -18,8 +18,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 print_function
-
 """
 High-level abstraction of an EC2 server
 """

boto/mturk/connection.py

@@ -18,8 +18,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 print_function
-
 import xml.sax
 import datetime
 import itertools

boto/mws/exception.py

@@ -18,8 +18,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 print_function
-
 from boto.exception import BotoServerError
 from boto.mws.response import ResponseFactory
 

boto/pyami/config.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 print_function
-
 import os
 import re
 import warnings

boto/pyami/launch_ami.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 print_function
-
 import getopt
 import sys
 import imp

boto/roboto/awsqueryrequest.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 print_function
-
 import sys
 import os
 import boto

boto/s3/resumable_download_handler.py

@@ -18,8 +18,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 print_function
-
 import errno
 import httplib
 import os
@@ -134,17 +132,17 @@ def _load_tracker_file_etag(self):
             # read correctly. Since ETags need not be MD5s, we now do a simple
             # length sanity check instead.
             if len(self.etag_value_for_current_download) < self.MIN_ETAG_LEN:
-                print(('Couldn\'t read etag in tracker file (%s). Restarting '
-                      'download from scratch.' % self.tracker_file_name))
+                print('Couldn\'t read etag in tracker file (%s). Restarting '
+                      'download from scratch.' % self.tracker_file_name)
         except IOError as e:
             # Ignore non-existent file (happens first time a download
             # is attempted on an object), but warn user for other errors.
             if e.errno != errno.ENOENT:
                 # Will restart because
                 # self.etag_value_for_current_download is None.
-                print(('Couldn\'t read URI tracker file (%s): %s. Restarting '
+                print('Couldn\'t read URI tracker file (%s): %s. Restarting '
                       'download from scratch.' %
-                      (self.tracker_file_name, e.strerror)))
+                      (self.tracker_file_name, e.strerror))
         finally:
             if f:
                 f.close()
@@ -290,7 +288,7 @@ def get_file(self, key, fp, headers, cb=None, num_cb=10, torrent=False,
                 return
             except self.RETRYABLE_EXCEPTIONS as e:
                 if debug >= 1:
-                    print(('Caught exception (%s)' % e.__repr__()))
+                    print('Caught exception (%s)' % e.__repr__())
                 if isinstance(e, IOError) and e.errno == errno.EPIPE:
                     # Broken pipe error causes httplib to immediately
                     # close the socket (http://bugs.python.org/issue5542),
@@ -306,21 +304,21 @@ def get_file(self, key, fp, headers, cb=None, num_cb=10, torrent=False,
                 if (e.disposition ==
                     ResumableTransferDisposition.ABORT_CUR_PROCESS):
                     if debug >= 1:
-                        print(('Caught non-retryable ResumableDownloadException '
-                              '(%s)' % e.message))
+                        print('Caught non-retryable ResumableDownloadException '
+                              '(%s)' % e.message)
                     raise
                 elif (e.disposition ==
                     ResumableTransferDisposition.ABORT):
                     if debug >= 1:
-                        print(('Caught non-retryable ResumableDownloadException '
+                        print('Caught non-retryable ResumableDownloadException '
                               '(%s); aborting and removing tracker file' %
-                              e.message))
+                              e.message)
                     self._remove_tracker_file()
                     raise
                 else:
                     if debug >= 1:
-                        print(('Caught ResumableDownloadException (%s) - will '
-                              'retry' % e.message))
+                        print('Caught ResumableDownloadException (%s) - will '
+                              'retry' % e.message)
 
             # At this point we had a re-tryable failure; see if made progress.
             if get_cur_file_size(fp) > had_file_bytes_before_attempt:
@@ -348,7 +346,7 @@ def get_file(self, key, fp, headers, cb=None, num_cb=10, torrent=False,
 
             sleep_time_secs = 2**progress_less_iterations
             if debug >= 1:
-                print(('Got retryable failure (%d progress-less in a row).\n'
+                print('Got retryable failure (%d progress-less in a row).\n'
                       'Sleeping %d seconds before re-trying' %
-                      (progress_less_iterations, sleep_time_secs)))
+                      (progress_less_iterations, sleep_time_secs))
             time.sleep(sleep_time_secs)

boto/sdb/connection.py

@@ -18,8 +18,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 print_function
-
 import xml.sax
 import threading
 import boto

boto/services/bs.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 print_function
-
 from optparse import OptionParser
 from boto.services.servicedef import ServiceDef
 from boto.services.submit import Submitter

boto/services/result.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 print_function
-
 import os
 from datetime import datetime, timedelta
 from boto.utils import parse_ts

boto/services/submit.py

@@ -18,8 +18,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 print_function
-
 import time
 import os
 

boto/sqs/queue.py

@@ -22,8 +22,6 @@
 """
 Represents an SQS Queue
 """
-from __future__ import print_function
-
 from boto.compat import urllib
 from boto.sqs.message import Message
 

scripts/git-release-notes.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
 import datetime
 import re
 import subprocess

scripts/rebuild_endpoints.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import json
 from pyquery import PyQuery as pq
 import requests

tests/integration/s3/test_connection.py

@@ -23,8 +23,6 @@
 """
 Some unit tests for the S3Connection
 """
-from __future__ import print_function
-
 import unittest
 import time
 import os

tests/integration/s3/test_encryption.py

@@ -24,8 +24,6 @@
 """
 Some unit tests for the S3 Encryption
 """
-from __future__ import print_function
-
 import unittest
 import time
 from boto.s3.connection import S3Connection

tests/integration/sqs/test_connection.py

@@ -24,8 +24,6 @@
 """
 Some unit tests for the SQSConnection
 """
-from __future__ import print_function, with_statement
-
 import time
 from threading import Timer
 from tests.unit import unittest

tests/unit/cloudsearch2/test_search.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 #!/usr/bin env python
 
 from tests.unit import unittest

tests/unit/route53/test_connection.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 print_function
-
 import mock
 import re
 import xml.dom.minidom