Skip to content

Commit a0667f7

Browse files
committed
Merge branch 'develop'
2 parents 781176e + 34b39af commit a0667f7

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

Makefile

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,3 @@ help:
8585
} \
8686
}' \
8787
$(MAKEFILE_LIST)
88-
89-
## Setup links in virtual env for development
90-
develop:
91-
@echo "--------------------------------------------------------------------"
92-
@echo "Setting up development environment"
93-
@python setup.py develop -q
94-
@echo ""
95-
@echo "Done."
96-
@echo ""
97-
98-
## Remove development links in virtual env
99-
undevelop:
100-
@echo "--------------------------------------------------------------------"
101-
@echo "Removing development environment"
102-
@python setup.py develop -q --uninstall
103-
@echo ""
104-
@echo "Done."
105-
@echo ""

src/cisco_gnmi/client.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ def get(
156156
"encoding", encoding, "Encoding", proto.gnmi_pb2.Encoding
157157
)
158158
request = proto.gnmi_pb2.GetRequest()
159-
try:
160-
iter(paths)
161-
except TypeError:
159+
if not isinstance(paths, (list, set, map)):
162160
raise Exception("paths must be an iterable containing Path(s)!")
163161
request.path.extend(paths)
164162
request.type = data_type

src/cisco_gnmi/xe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def parse_xpath_to_gnmi_path(self, xpath, origin=None):
312312
"""
313313
if origin is None:
314314
# naive but effective
315-
if "openconfig" in xpath:
315+
if ":" in xpath:
316316
origin = "openconfig"
317317
else:
318318
origin = "rfc7951"

0 commit comments

Comments
 (0)