From dd81fefaf3249014009d9598b0278b9ee02a6275 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@fedoraproject.org>
Date: Sat, 3 Aug 2013 01:13:40 +0000
Subject: [PATCH] Minor cleanup

---
 .gitignore                |  4 ++-
 requestbuilder/command.py |  5 ++--
 requestbuilder/request.py |  6 ++---
 requirements.txt          |  2 --
 setup.py                  | 53 +++++++++++++++++----------------------
 5 files changed, 32 insertions(+), 38 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/.gitignore b/.gitignore
index aed7ea0..4e3f53c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,11 @@
 .DS_Store
 core
 core.*
-*.egg_info
 *.pyc
 *.pyo
 __pycache__
+/.idea
 /build
 /dist
+/*.egg-info
+/MANIFEST
diff --git a/requestbuilder/command.py b/requestbuilder/command.py
index e776723..31c3845 100644
--- a/requestbuilder/command.py
+++ b/requestbuilder/command.py
@@ -223,13 +223,14 @@ class BaseCommand(object):
         # Everything goes in self.args.  distribute_args() also puts them
         # elsewhere later on in the process.
         self.args.update(cli_args)
+        redacted = type('REDACTED', (),
+                        {'__repr__': lambda self: '<redacted>'})()
         for key in list(cli_args.keys()):
             if (('password' in key.lower() or 'secret' in key.lower()) and
                 cli_args[key] is not None):
                 # This makes it slightly more obvious that this is redacted by
                 # the framework and not just a string by removing quotes.
-                cli_args[key] = type('REDACTED', (),
-                    {'__repr__': lambda self: '<redacted>'})()
+                cli_args[key] = redacted
         self.log.debug('parsed arguments: ' + str(cli_args))
 
     def distribute_args(self):
diff --git a/requestbuilder/request.py b/requestbuilder/request.py
index 7bc95b0..9015b36 100644
--- a/requestbuilder/request.py
+++ b/requestbuilder/request.py
@@ -125,9 +125,9 @@ class BaseRequest(BaseCommand):
         headers.setdefault('User-Agent', self.suite.get_user_agent())
         params  = self.prepare_params()
         try:
-            self.response = self.service.send_request(method=self.method,
-                    path=self.path, headers=headers, params=params,
-                    data=self.body)
+            self.response = self.service.send_request(
+                method=self.method, path=self.path, headers=headers,
+                params=params, data=self.body)
             return self.parse_response(self.response)
         except ServerError as err:
             self.response = err.response
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 640e3d4..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-requests
-six
diff --git a/setup.py b/setup.py
index d6ec9e3..bd3dac7 100644
--- a/setup.py
+++ b/setup.py
@@ -15,11 +15,7 @@
 from distutils.command.build_py import build_py
 from distutils.command.sdist import sdist
 import os.path
-
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import find_packages, setup
 
 from requestbuilder import __version__
 
@@ -66,28 +62,25 @@ class sdist_with_git_version(sdist):
         os.rename(new_init_name, old_init_name)
 
 
-setup(name = 'requestbuilder',
-      version = __version__,
-      description = 'Command line-driven HTTP request builder',
-      author = 'Garrett Holmstrom (gholms)',
-      author_email = 'gholms@devzero.com',
-      packages = ['requestbuilder',
-                  'requestbuilder.commands',
-                 ],
-      license = 'ISC',
-      platforms = 'Posix; MacOS X',
-      classifiers = ['Development Status :: 3 - Alpha',
-                     'Intended Audience :: Developers',
-                     'License :: OSI Approved :: ISC License (ISCL)',
-                     'Programming Language :: Python',
-                     'Programming Language :: Python :: 2',
-                     'Programming Language :: Python :: 2.6',
-                     'Programming Language :: Python :: 2.7',
-                     'Topic :: Internet'],
-      install_requires = [
-          "argparse",
-          "requests",
-          "six",
-      ],
-      cmdclass = {'build_py': build_py_with_git_version,
-                  'sdist': sdist_with_git_version})
+setup(name='requestbuilder',
+      version=__version__,
+      description='Command line-driven HTTP request builder',
+      author='Garrett Holmstrom (gholms)',
+      author_email='gholms@devzero.com',
+      packages=find_packages(),
+      install_requires=['argparse',
+                        'requests',
+                        'six'],
+      license='ISC',
+      platforms='Posix; MacOS X',
+      classifiers=['Development Status :: 3 - Alpha',
+                   'Intended Audience :: Developers',
+                   'License :: OSI Approved :: ISC License (ISCL)',
+                   'Operating System :: OS Independent',
+                   'Programming Language :: Python',
+                   'Programming Language :: Python :: 2',
+                   'Programming Language :: Python :: 2.6',
+                   'Programming Language :: Python :: 2.7',
+                   'Topic :: Internet'],
+      cmdclass={'build_py': build_py_with_git_version,
+                'sdist': sdist_with_git_version})