Merge lp:~cprov/adt-continuous-deployer/refactoring-fixes into lp:adt-continuous-deployer

[Celso Providelo]

Missing get_revnos_for_spec() import and other drive-by flake8 issues.

Missing get_revnos_for_spec() import and other drive-by flake8 issues.

[Thomi Richards (thomir-deactivatedaccount)]

Thanks!

review: Approve

=== modified file 'cd.py'
--- cd.py	2015-06-02 00:38:10 +0000
+++ cd.py	2015-06-03 17:33:24 +0000
@@ -28,6 +28,7 @@
 from ci_automation.branch import (
     get_info_from_revno_dict,
     get_info_message_from_revno_dict,
+    get_revnos_for_spec,
 )
 from ci_automation.mojo_project_pool import (
     MojoProjectPool,
@@ -56,7 +57,8 @@
     )
     parser.add_argument('--branch', required=True)
     parser.add_argument('--stage', required=True)
-    parser.add_argument('--use-project-pool', action='store_true', default=False)
+    parser.add_argument('--use-project-pool',
+                        action='store_true', default=False)
 
     # Parse known arguments, collect (and augment) the rest as 'mojo_args'.
     args, mojo_args = parser.parse_known_args()
@@ -112,8 +114,8 @@
         )
         try:
             with pool.acquire_mojo_project() as project_name:
-                # Register deployment identifier regardless its deployment status.
-                # We don't want to deploy it again.
+                # Register deployment identifier regardless its deployment
+                # status. We don't want to deploy it again.
                 with open(identifier_path, 'w') as fd:
                     fd.write(info + '\n')
 

=== modified file 'reaper.py'
--- reaper.py	2015-05-28 00:21:30 +0000
+++ reaper.py	2015-06-03 17:33:24 +0000
@@ -54,7 +54,7 @@
         return 1
 
     name = os.path.basename(env_dir)
-    if juju.deployment_has_floating_ips(name, base):
+    if juju.deployment_has_floating_ips(name, args.base):
         print("""\
 Cowardly refusing to reap that, since it has floating IP addresses assigned.