summaryrefslogtreecommitdiffstats
path: root/.gitreview
blob: 8b5a8f7de287a7d41e1811c3f65700706c40b7b3 (plain) 
1
2
3
4

[gerrit]
host=gerrit.automotivelinux.org
port=29418
project=AGL/meta-agl
claration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
From 1da7b980d05706c8d4e9bcb0d12965258a4fc709 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 6 Oct 2022 16:07:00 -0400
Subject: [PATCH] kuksa_viss_client: Update cmd2 completer usage

Update cmd2 usage to avoid using internal methods and fix breakage
with newer versions of the cmd2 module.

Upstream-Status: pending

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 kuksa_viss_client/__main__.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/kuksa_viss_client/__main__.py b/kuksa_viss_client/__main__.py
index 5e595f8..e5798b8 100755
--- a/kuksa_viss_client/__main__.py
+++ b/kuksa_viss_client/__main__.py
@@ -23,7 +23,7 @@ from typing import Dict, List
 import queue, time, os, threading
 from pygments import highlight, lexers, formatters
 from cmd2 import Cmd, with_argparser, with_category, Cmd2ArgumentParser, CompletionItem
-from cmd2.utils import CompletionError, basic_complete
+from cmd2.exceptions import CompletionError
 import functools, subprocess
 DEFAULT_SERVER_ADDR = "127.0.0.1"
 DEFAULT_SERVER_PORT = 8090
@@ -103,7 +103,7 @@ class TestClient(Cmd):
                 if 'children' in child:
                     self.pathCompletionItems.append(CompletionItem(prefix + key+seperator, "Children of branch "+prefix+key))
 
-        return basic_complete(text, line, begidx, endidx, self.pathCompletionItems)
+        return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems)
 
     def subscribeCallback(self, path, attr, resp):
         self.subscribeFileDesc[(path,attr)].write(resp + "\n")
@@ -113,7 +113,7 @@ class TestClient(Cmd):
         self.pathCompletionItems = []
         for id in self.subscribeIdToPath.keys():
             self.pathCompletionItems.append(CompletionItem(id))
-        return basic_complete(text, line, begidx, endidx, self.pathCompletionItems)
+        return Cmd.basic_complete(self, text, line, begidx, endidx, self.pathCompletionItems)
     
     COMM_SETUP_COMMANDS = "Communication Set-up Commands"
     VISS_COMMANDS = "Kuksa Interaction Commands"
@@ -126,45 +126,45 @@ class TestClient(Cmd):
     ap_authorize = argparse.ArgumentParser()
     tokenfile_completer_method = functools.partial(Cmd.path_complete,
         path_filter=lambda path: (os.path.isdir(path) or path.endswith(".token")))
-    ap_authorize.add_argument('Token', help='JWT(or the file storing the token) for authorizing the client.', completer_method=tokenfile_completer_method)
+    ap_authorize.add_argument('Token', help='JWT(or the file storing the token) for authorizing the client.', completer=tokenfile_completer_method)
     ap_setServerAddr = argparse.ArgumentParser()
     ap_setServerAddr.add_argument('IP', help='VISS Server IP Address', default=DEFAULT_SERVER_ADDR)
     ap_setServerAddr.add_argument('Port', type=int, help='VISS Server Port', default=DEFAULT_SERVER_PORT)
     ap_setServerAddr.add_argument('-p', "--protocol", help='VISS Server Communication Protocol (ws or grpc)', default=DEFAULT_SERVER_PROTOCOL)
 
     ap_setValue = argparse.ArgumentParser()
-    ap_setValue.add_argument("Path", help="Path to be set", completer_method=path_completer)
+    ap_setValue.add_argument("Path", help="Path to be set", completer=path_completer)
     ap_setValue.add_argument("Value", help="Value to be set")
     ap_setValue.add_argument("-a", "--attribute", help="Attribute to be set", default="value")
 
     ap_getValue = argparse.ArgumentParser()
-    ap_getValue.add_argument("Path", help="Path to be read", completer_method=path_completer)
+    ap_getValue.add_argument("Path", help="Path to be read", completer=path_completer)
     ap_getValue.add_argument("-a", "--attribute", help="Attribute to be get", default="value")
 
     ap_setTargetValue = argparse.ArgumentParser()
-    ap_setTargetValue.add_argument("Path", help="Path whose target value to be set", completer_method=path_completer)
+    ap_setTargetValue.add_argument("Path", help="Path whose target value to be set", completer=path_completer)
     ap_setTargetValue.add_argument("Value", help="Value to be set")
 
     ap_getTargetValue = argparse.ArgumentParser()
-    ap_getTargetValue.add_argument("Path", help="Path whose target value to be read", completer_method=path_completer)
+    ap_getTargetValue.add_argument("Path", help="Path whose target value to be read", completer=path_completer)
 
     ap_subscribe = argparse.ArgumentParser()
-    ap_subscribe.add_argument("Path", help="Path to be subscribed", completer_method=path_completer)
+    ap_subscribe.add_argument("Path", help="Path to be subscribed", completer=path_completer)
     ap_subscribe.add_argument("-a", "--attribute", help="Attribute to be subscribed", default="value")
 
     ap_unsubscribe = argparse.ArgumentParser()
-    ap_unsubscribe.add_argument("SubscribeId", help="Corresponding subscription Id", completer_method=subscriptionIdCompleter)
+    ap_unsubscribe.add_argument("SubscribeId", help="Corresponding subscription Id", completer=subscriptionIdCompleter)
 
     ap_getMetaData = argparse.ArgumentParser()
-    ap_getMetaData.add_argument("Path", help="Path whose metadata is to be read", completer_method=path_completer)
+    ap_getMetaData.add_argument("Path", help="Path whose metadata is to be read", completer=path_completer)
     ap_updateMetaData = argparse.ArgumentParser()
-    ap_updateMetaData.add_argument("Path", help="Path whose MetaData is to update", completer_method=path_completer)
+    ap_updateMetaData.add_argument("Path", help="Path whose MetaData is to update", completer=path_completer)
     ap_updateMetaData.add_argument("Json", help="MetaData to update. Note, only attributes can be update, if update children or the whole vss tree, use `updateVSSTree` instead.")
 
     ap_updateVSSTree = argparse.ArgumentParser()
     jsonfile_completer_method = functools.partial(Cmd.path_complete,
         path_filter=lambda path: (os.path.isdir(path) or path.endswith(".json")))
-    ap_updateVSSTree.add_argument("Json", help="Json tree to update VSS", completer_method=jsonfile_completer_method)
+    ap_updateVSSTree.add_argument("Json", help="Json tree to update VSS", completer=jsonfile_completer_method)
 
     # Constructor
     def __init__(self):
-- 
2.37.3