From 30dc62614f95a145ddbde09fb01c63e2d7cfd317 Mon Sep 17 00:00:00 2001
From: eldar nugaev <eldar.nugaev@hp.com>
Date: Tue, 12 Jan 2016 16:41:24 +0000
Subject: [PATCH] Command for changing logging level. And pep8 fixing (suddenly
 this pull request was rejected by jenkins and pep8. so this commit also
 contains some small style changes for pep8.)

Currently the default value for logging is INFO and it is hardcoded.
Additional command will be helpful for debug/development process.

Implements blueprint: logging-level-cli

Change-Id: I1105e3da277e2a948f3ff50b04751169eddf26ed
---
 backups.py    |  2 +-
 client.py     | 23 +++++++++++------------
 exceptions.py |  6 +++---
 sessions.py   |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/backups.py b/backups.py
index bcc75c5..956fbfa 100644
--- a/backups.py
+++ b/backups.py
@@ -17,7 +17,7 @@ limitations under the License.
 import json
 import requests
 
-import exceptions
+from freezer.apiclient import exceptions
 
 
 class BackupsManager(object):
diff --git a/client.py b/client.py
index b7b5364..f20b9a9 100644
--- a/client.py
+++ b/client.py
@@ -16,20 +16,19 @@ limitations under the License.
 client interface to the Freezer API
 """
 
-import argparse
 import os
 import socket
 
 from keystoneclient.auth.identity import v2
 from keystoneclient.auth.identity import v3
 from keystoneclient import session as ksc_session
-
-from backups import BackupsManager
-from registration import RegistrationManager
-from jobs import JobManager
-from actions import ActionManager
-from sessions import SessionManager
 from oslo_config import cfg
+
+from freezer.apiclient import actions
+from freezer.apiclient import backups
+from freezer.apiclient import jobs
+from freezer.apiclient import registration
+from freezer.apiclient import sessions
 from freezer.utils import Namespace
 
 CONF = cfg.CONF
@@ -225,11 +224,11 @@ class Client(object):
         self._session = session
         self.version = version
 
-        self.backups = BackupsManager(self, verify=verify)
-        self.registration = RegistrationManager(self, verify=verify)
-        self.jobs = JobManager(self, verify=verify)
-        self.actions = ActionManager(self, verify=verify)
-        self.sessions = SessionManager(self, verify=verify)
+        self.backups = backups.BackupsManager(self, verify=verify)
+        self.registration = registration.RegistrationManager(self, verify=verify)
+        self.jobs = jobs.JobManager(self, verify=verify)
+        self.actions = actions.ActionManager(self, verify=verify)
+        self.sessions = sessions.SessionManager(self, verify=verify)
 
 
     @cached_property
diff --git a/exceptions.py b/exceptions.py
index 5539bee..5e3dd08 100644
--- a/exceptions.py
+++ b/exceptions.py
@@ -38,7 +38,7 @@ class ApiClientException(Exception):
             message = "[*] Error {0}: {1}".format(
                 r.status_code,
                 body['description'])
-        except:
+        except Exception:
             message = None
         return message
 
@@ -55,7 +55,7 @@ class ApiClientException(Exception):
             message = "[*] Error {0}: {1}".format(
                 r.status_code,
                 r.text)
-        except:
+        except Exception:
             message = None
         return message
 
@@ -65,6 +65,6 @@ class ApiClientException(Exception):
             str(r)
         try:
             self.status_code = r.status_code
-        except:
+        except Exception:
             self.status_code = None
         super(ApiClientException, self).__init__(message)
diff --git a/sessions.py b/sessions.py
index e9ccf01..7e00783 100644
--- a/sessions.py
+++ b/sessions.py
@@ -17,7 +17,7 @@ limitations under the License.
 import json
 import requests
 
-import exceptions
+from freezer.apiclient import exceptions
 
 
 class SessionManager(object):