Merge pull request #57 from bradmwilliams/formatting_cleanup

Code cleanup

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-3cc90352c787fb2a66626b33f149e1f9  -
+14fd6a307ac3c1c78d0a1e69452ae072  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 from .context import *
 from .base_verbs import *
 from .model import OpenShiftPythonException

packages/openshift/__init__.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 import subprocess
 import time
 import socket
@@ -7,9 +8,10 @@
 import re
 import datetime
 import traceback
+import six
 
 from .util import TempFile, is_collection_type
-import six
+
 
 # Three base64 encoded components, '.' delimited is a token. First, find any such match.
 # You can find examples of these tokens with `oc sa get-token <serviceaccount name>`

packages/openshift/action.py

@@ -1,14 +1,16 @@
 from __future__ import absolute_import
+
+import yaml
+import sys
+import copy
+
 from .action import *
 from .model import *
 from .result import *
 from .naming import kind_matches
+from .context import cur_context
+from .selector import selector
 from . import util
-import yaml
-import json
-import sys
-import copy
-from six.moves import range
 
 _DEFAULT = object()
 
@@ -483,7 +485,7 @@ def modify_and_apply(self, modifier_func, retries=2, cmd_args=None):
         """
         r = Result("apply")
 
-        applied_change = False;
+        applied_change = False
         for attempt in reversed(list(range(retries + 1))):
 
             do_apply = modifier_func(self)
@@ -877,7 +879,3 @@ def execute(self, cmd_to_exec=None, stdin=None, container_name=None, auto_raise=
             r.fail_if(
                 "Error running {} exec on {} [rc={}]: {}".format(self.qname(), cmd_to_exec[0], r.status(), r.err()))
         return r
-
-
-from .context import cur_context
-from .selector import selector

packages/openshift/apiobject.py

@@ -2,14 +2,6 @@
 from __future__ import absolute_import
 
 import os
-from .selector import Selector, selector
-from .action import oc_action
-from .context import cur_context, project, no_tracking
-from .result import Result
-from .apiobject import APIObject
-from .model import Model, Missing, OpenShiftPythonException
-from . import util
-from . import naming
 import base64
 import io
 import sys
@@ -19,6 +11,15 @@
 import yaml
 import six
 
+from .selector import Selector, selector
+from .action import oc_action
+from .context import cur_context, project, no_tracking
+from .result import Result
+from .apiobject import APIObject
+from .model import Model, Missing, OpenShiftPythonException
+from . import util
+from . import naming
+
 
 def eprint(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)

packages/openshift/base_verbs.py

@@ -1,6 +1,5 @@
-#!/usr/bin/python
-
 from __future__ import absolute_import
+
 import openshift as oc
 import base64
 import json

packages/openshift/config.py

@@ -1,10 +1,11 @@
 from __future__ import absolute_import
+
+import inspect
+import os
+
 from datetime import datetime
 from datetime import timedelta
 from threading import local
-import inspect
-
-import os
 
 from .result import Result
 

packages/openshift/context.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
+
 import six
+
 from six.moves import range
 
 
@@ -111,7 +113,7 @@ def to_model_or_val(v, case_insensitive=False):
         return v
 
 
-def _element_can_match( master, test, case_insensitive=False):
+def _element_can_match(master, test, case_insensitive=False):
     if master is Missing:
         return False
 

packages/openshift/model.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+
 import six
 
 # A dict of name -> APIResource.
@@ -231,6 +232,7 @@ def get_column_value(line, column_name):
         except StopIteration:
             break
 
+
 # just paste the output of `oc api-resources --verbs=get` in this variable (including header!).
 # It will be processed on startup. this could eventually be replaced with
 # calls to --raw 'api/v1', 'apis/..../v1'.. etc, but let oc do the work for us.