Post-review cleanup

requestbuilder/command.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2012-2015, Eucalyptus Systems, Inc.
+# Copyright (c) 2012-2016 Hewlett Packard Enterprise Development LP
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -29,6 +29,8 @@ try:
 except ImportError:
     import pdb
 
+import six
+
 from requestbuilder import Arg, MutuallyExclusiveArgList
 from requestbuilder.config import ConfigData, ConfigView
 from requestbuilder.exceptions import ArgumentError
@@ -37,9 +39,6 @@ from requestbuilder.suite import RequestBuilder
 from requestbuilder.util import add_default_routes, aggregate_subclass_fields
 
 
-import six
-
-
 class BaseCommand(object):
     """
     The basis for a command line tool.  To invoke this as a command line tool,

requestbuilder/config.py

@@ -17,9 +17,7 @@ from __future__ import absolute_import
 import itertools
 import logging
 
-
-import six
-from six.moves import configparser
+import six.moves
 
 
 class ConfigView(object):
@@ -118,7 +116,7 @@ class ConfigData(object):
         self._parse_config(filenames)
 
     def _parse_config(self, filenames):
-        parser = configparser.SafeConfigParser()
+        parser = six.moves.configparser.SafeConfigParser()
         parser.read(filenames)
         for section in parser.sections():
             if section == 'global':

requestbuilder/request.py

@@ -23,6 +23,8 @@ import sys
 import textwrap
 import warnings
 
+import six
+
 from requestbuilder import EMPTY, PARAMS
 from requestbuilder.command import BaseCommand
 from requestbuilder.exceptions import ServerError
@@ -31,9 +33,6 @@ from requestbuilder.util import aggregate_subclass_fields
 from requestbuilder.xmlparse import parse_listdelimited_aws_xml
 
 
-import six
-
-
 class BaseRequest(BaseCommand):
     """
     The basis for a command line tool that represents a request.  The data for

setup.py

@@ -88,9 +88,6 @@ setup(name='requestbuilder',
                    'Programming Language :: Python :: 2',
                    'Programming Language :: Python :: 2.6',
                    'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.4',
-                   'Programming Language :: Python :: 3.5',
                    'Topic :: Internet'],
       cmdclass={'build_py': build_py_with_git_version,
                 'sdist': sdist_with_git_version})