From 393ef9d5d0440eb4c68a37c4eef51f8175e71a0b Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Wed, 12 Nov 2014 09:47:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=D0=BE=D0=B2=20core-3.3=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=B7=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B8=20=D1=81=203.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/console/application/cert_func.py       |  5 +++-
 pym/console/application/pid_information.py | 28 +++++++---------------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pym/console/application/cert_func.py b/pym/console/application/cert_func.py
index 7ee84bc..b2ed3e5 100644
--- a/pym/console/application/cert_func.py
+++ b/pym/console/application/cert_func.py
@@ -34,7 +34,10 @@ def client_post_cert (client, clVars, show_info = False):
     """ send a certificate server for check """
     sid = get_sid(client.SID_FILE)
     
-    lang = os.environ['LANG'][:2]
+    if "LANG" in os.environ:
+        lang = os.environ['LANG'][:2]
+    else:
+        lang = "C"
     _result_post_cert, _result_sid = client.service.init_session(sid, lang)
     result_post_cert = _result_post_cert[1].integer
     result_sid = _result_sid[1].integer
diff --git a/pym/console/application/pid_information.py b/pym/console/application/pid_information.py
index 05ebe2f..dc58d6b 100644
--- a/pym/console/application/pid_information.py
+++ b/pym/console/application/pid_information.py
@@ -93,32 +93,22 @@ def client_pid_info(client):
 
 def client_list_methods(client):
     """ get & show all available methods for this certificate """
-    DAT = 0 # Access to data soap structure
-    RES = 0 # Access to result
-    COM = 0 # Getting command line
-    METH = 1 # Getting method line
-    TR_METH = 3 # Translate method name
     results = client.service.get_methods(client.sid, client_types)
     if not results:
         print _('No methods available')
         return 1
     try:
-        if results[DAT][RES][RES][COM] == '0':
-            print _('No methods available')
-            return 1
+        results[0][0].name
     except:
-        pass
+        print _('No methods available')
+        return 1
     print _("You can execute:"), _('use option'), '--method'
-    group_dict = {}
-    for group in results.stringArray:
-        if len (group.string) == 4:
-            group_dict[group.string[METH]] = group.string[TR_METH]
-        if len (group.string) == 3:
-            group_dict[group.string[METH]] = group.string[TR_METH-1]
-    sort_keys = group_dict.keys()
-    sort_keys.sort()
-    for key in sort_keys:
-        print "   %s - %s" % (key, group_dict[key])
+    for method in sorted(results[0],key=lambda x:x.name):
+        if method.title:
+            print "   {name} - {title}".format(name=method.name,
+                                               title=method.title)
+        else:
+            print "   {name}".format(name=name)
 
 def client_pid_kill(client, pid):
     sid = get_sid(client.SID_FILE)