Merge pull request #30 from cisco-ie/fix-proto-msg-append

Replace proto append with extend for protobuf < 3.8.0

Author: remingtonc

src/cisco_gnmi/client.py

@@ -154,8 +154,7 @@ def get(
         request = proto.gnmi_pb2.GetRequest()
         if not isinstance(paths, (list, set)):
             raise Exception("paths must be an iterable containing Path(s)!")
-        for path in paths:
-            request.path.append(path)
+        request.path.extend(paths)
         request.type = data_type
         request.encoding = encoding
         if prefix:
@@ -201,17 +200,13 @@ def set(
             if not isinstance(item, (list, set)):
                 raise Exception("updates, replaces, and deletes must be iterables!")
         if updates:
-            for update in updates:
-                request.update.append(update)
+            request.update.extend(updates)
         if replaces:
-            for update in replaces:
-                request.replace.append(update)
+            request.replaces.extend(replaces)
         if deletes:
-            for path in deletes:
-                request.delete.append(path)
+            request.delete.extend(deletes)
         if extensions:
-            for extension in extensions:
-                request.extension.append(extension)
+            request.extension.extend(extensions)
         response = self.service.Set(request)
         return response
 
@@ -248,8 +243,7 @@ def validate_request(request):
                     "request must be a SubscriptionList, Poll, or AliasList!"
                 )
             if extensions:
-                for extension in extensions:
-                    subscribe_request.extensions.append(extension)
+                subscribe_request.extensions.extend(extensions)
             return subscribe_request
 
         response_stream = self.service.Subscribe(
@@ -280,14 +274,15 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
         # TODO: Lazy
         xpath = xpath.strip("/")
         xpath_elements = xpath_tokenizer_re.findall(xpath)
+        path_elems = []
         for index, element in enumerate(xpath_elements):
             # stripped initial /, so this indicates a completed element
             if element[0] == "/":
                 if not curr_elem.name:
                     raise Exception(
                         "Current PathElem has no name yet is trying to be pushed to path! Invalid XPath?"
                     )
-                path.elem.append(curr_elem)
+                path_elems.append(curr_elem)
                 curr_elem = proto.gnmi_pb2.PathElem()
                 continue
             # We are entering a filter
@@ -333,8 +328,9 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
         # If we have a dangling element that hasn't been completed due to no
         # / element then let's just append the final element.
         if curr_elem:
-            path.elem.append(curr_elem)
+            path_elems.append(curr_elem)
             curr_elem = None
         if any([curr_elem, curr_key, in_filter]):
             raise Exception("Unfinished elements in XPath parsing!")
+        path.elem.extend(path_elems)
         return path

src/cisco_gnmi/nx.py

@@ -123,6 +123,7 @@ def subscribe_xpaths(
         )
         if isinstance(xpath_subscriptions, string_types):
             xpath_subscriptions = [xpath_subscriptions]
+        subscriptions = []
         for xpath_subscription in xpath_subscriptions:
             subscription = None
             if isinstance(xpath_subscription, string_types):
@@ -159,7 +160,8 @@ def subscribe_xpaths(
                 subscription = xpath_subscription
             else:
                 raise Exception("xpath in list must be xpath or dict/Path!")
-            subscription_list.subscription.append(subscription)
+            subscriptions.append(subscription)
+        subscription_list.subscription.extend(subscriptions)
         return self.subscribe([subscription_list])
 
     def parse_xpath_to_gnmi_path(self, xpath, origin=None):

src/cisco_gnmi/xe.py

@@ -270,6 +270,7 @@ def subscribe_xpaths(
         )
         if isinstance(xpath_subscriptions, string_types):
             xpath_subscriptions = [xpath_subscriptions]
+        subscriptions = []
         for xpath_subscription in xpath_subscriptions:
             subscription = None
             if isinstance(xpath_subscription, string_types):
@@ -306,7 +307,8 @@ def subscribe_xpaths(
                 subscription = xpath_subscription
             else:
                 raise Exception("xpath in list must be xpath or dict/Path!")
-            subscription_list.subscription.append(subscription)
+            subscriptions.append(subscription)
+        subscription_list.subscription.extend(subscriptions)
         return self.subscribe([subscription_list])
 
     def parse_xpath_to_gnmi_path(self, xpath, origin=None):

src/cisco_gnmi/xr.py

@@ -284,6 +284,7 @@ def subscribe_xpaths(
         )
         if isinstance(xpath_subscriptions, string_types):
             xpath_subscriptions = [xpath_subscriptions]
+        subscriptions = []
         for xpath_subscription in xpath_subscriptions:
             subscription = None
             if isinstance(xpath_subscription, string_types):
@@ -324,7 +325,8 @@ def subscribe_xpaths(
                 subscription = xpath_subscription
             else:
                 raise Exception("xpath in list must be xpath or dict/Path!")
-            subscription_list.subscription.append(subscription)
+            subscriptions.append(subscription)
+        subscription_list.subscription.extend(subscriptions)
         return self.subscribe([subscription_list])
 
     def parse_xpath_to_gnmi_path(self, xpath, origin=None):