Repository: stratos Updated Branches: refs/heads/stratos-4.1.x bdd667a8d -> dfb6a246d
Auth and Print tree improved Signed-off-by: Imesh Gunaratne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0130ee9e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0130ee9e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0130ee9e Branch: refs/heads/stratos-4.1.x Commit: 0130ee9ece1e62bb1d2653a8eb3bb0d8a421fbf1 Parents: 78d69cc Author: Milindu Sanoj Kumarage <[email protected]> Authored: Thu Jun 18 22:07:56 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Oct 13 16:32:44 2015 +0530 ---------------------------------------------------------------------- .../src/main/python/cli/Utils.py | 34 +++++++++++--------- .../src/main/python/cli/exceptions/__init__.py | 1 + 2 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0130ee9e/components/org.apache.stratos.python.cli/src/main/python/cli/Utils.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cli/src/main/python/cli/Utils.py b/components/org.apache.stratos.python.cli/src/main/python/cli/Utils.py index 2b67d8b..ade30f4 100644 --- a/components/org.apache.stratos.python.cli/src/main/python/cli/Utils.py +++ b/components/org.apache.stratos.python.cli/src/main/python/cli/Utils.py @@ -1,3 +1,5 @@ +from __future__ import print_function +import sys from texttable import * import Configs from Logging import logging @@ -10,15 +12,15 @@ class PrintableTree: pass def print_tree(self): - def _print(t, level=0, ups=""): + def _print_tree(t, level=0, ups=""): if isinstance(t, list): print('|') for element in t[:-1]: - print(ups + "+-") - _print(element, level + 1, ups + "| ") + print(ups + "+-", end='') + _print_tree(element, level + 1, ups + "| ") else: - print(ups + "+-") - _print(t[-1], level + 1, ups + " ") + print(ups + "+-", end='') + _print_tree(t[-1], level + 1, ups + " ") elif isinstance(t, dict): print('|') l = [] @@ -26,18 +28,18 @@ class PrintableTree: if isinstance(v, list) or isinstance(v, dict): l.extend([k, v]) else: - l.extend([k + " : " + v]) + l.extend([str(k) + " : " + str(v)]) t = l for element in t[:-1]: - print(ups + "+-") - _print(element, level + 1, ups + "| ") + print(ups + "+-", end='') + _print_tree(element, level + 1, ups + "| ") else: - print(ups + "+-") - _print(t[-1], level + 1, ups + " ") + print(ups + "+-", end='') + _print_tree(t[-1], level + 1, ups + " ") else: - print(t) - - _print(self.tree_data) + print(str(t)) + print("_") + _print_tree(self.tree_data) class PrintableTable(Texttable): @@ -47,15 +49,15 @@ class PrintableTable(Texttable): self.set_deco(Texttable.BORDER | Texttable.HEADER | Texttable.VLINES) def print_table(self): - print self.draw() + print(self.draw()) def auth(func): """Authenticate""" def auth_inner(self, *args, **kwargs): - if len(args) > 1 and args[1].username is not None: + if len(args) > 1 and hasattr(args[1], 'username') and args[1].username is not None: Configs.stratos_username = args[1].username - if len(args) > 1 and args[1].password is not None: + if len(args) > 1 and hasattr(args[1], 'password') and args[1].password is not None: Configs.stratos_password = args[1].password if Configs.stratos_username is "" and Configs.stratos_password is "": http://git-wip-us.apache.org/repos/asf/stratos/blob/0130ee9e/components/org.apache.stratos.python.cli/src/main/python/cli/exceptions/__init__.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cli/src/main/python/cli/exceptions/__init__.py b/components/org.apache.stratos.python.cli/src/main/python/cli/exceptions/__init__.py new file mode 100644 index 0000000..f80b5be --- /dev/null +++ b/components/org.apache.stratos.python.cli/src/main/python/cli/exceptions/__init__.py @@ -0,0 +1 @@ +__author__ = 'agentmilindu'
