Skip to content

Commit eae401f

Browse files
remove functional change
1 parent 33883f0 commit eae401f

14 files changed

Lines changed: 12 additions & 118 deletions

File tree

build/templates/_converters.py.mako

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ def _(repeated_capability, prefix):
121121
return _convert_repeated_capabilities(rng, prefix)
122122

123123

124-
def _add_repeated_capability_prefix(repeated_capability, prefix):
125-
path, separator, identifier = repeated_capability.rpartition('/')
126-
return path + separator + prefix + identifier
127-
128-
129124
def convert_repeated_capabilities(repeated_capability, prefix=''):
130125
'''Convert a repeated capabilities object to a comma delimited list
131126

@@ -139,10 +134,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
139134
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
140135
if repeated_capability is None:
141136
return []
142-
return [
143-
_add_repeated_capability_prefix(repeated_capability, prefix)
144-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
145-
]
137+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
146138

147139

148140
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nidcpower/nidcpower/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ def ifnone(a, b):
112112
return _convert_repeated_capabilities(rng, prefix)
113113

114114

115-
def _add_repeated_capability_prefix(repeated_capability, prefix):
116-
path, separator, identifier = repeated_capability.rpartition('/')
117-
return path + separator + prefix + identifier
118-
119-
120115
def convert_repeated_capabilities(repeated_capability, prefix=''):
121116
'''Convert a repeated capabilities object to a comma delimited list
122117
@@ -130,10 +125,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
130125
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
131126
if repeated_capability is None:
132127
return []
133-
return [
134-
_add_repeated_capability_prefix(repeated_capability, prefix)
135-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
136-
]
128+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
137129

138130

139131
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nidigital/nidigital/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nidmm/nidmm/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nifake/nifake/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ def ifnone(a, b):
112112
return _convert_repeated_capabilities(rng, prefix)
113113

114114

115-
def _add_repeated_capability_prefix(repeated_capability, prefix):
116-
path, separator, identifier = repeated_capability.rpartition('/')
117-
return path + separator + prefix + identifier
118-
119-
120115
def convert_repeated_capabilities(repeated_capability, prefix=''):
121116
'''Convert a repeated capabilities object to a comma delimited list
122117
@@ -130,10 +125,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
130125
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
131126
if repeated_capability is None:
132127
return []
133-
return [
134-
_add_repeated_capability_prefix(repeated_capability, prefix)
135-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
136-
]
128+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
137129

138130

139131
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nifake/nifake/unit_tests/test_converters.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ def test_repeated_capabilities_string_prefix():
9292
assert test_result_list == ['ScriptTrigger0']
9393

9494

95-
def test_repeated_capabilities_fully_qualified_string_prefix():
96-
test_result_list = _converters.convert_repeated_capabilities('PXI1Slot2/tmu0,PXI1Slot2/tmu1', prefix='tmu')
97-
assert test_result_list == ['PXI1Slot2/tmu0', 'PXI1Slot2/tmu1']
98-
99-
10095
def test_repeated_capabilities_list_channel():
10196
test_result_list = _converters.convert_repeated_capabilities(['0'])
10297
assert test_result_list == ['0']

generated/nifgen/nifgen/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nimodinst/nimodinst/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/nirfsg/nirfsg/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

generated/niscope/niscope/_converters.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ def ifnone(a, b):
111111
return _convert_repeated_capabilities(rng, prefix)
112112

113113

114-
def _add_repeated_capability_prefix(repeated_capability, prefix):
115-
path, separator, identifier = repeated_capability.rpartition('/')
116-
return path + separator + prefix + identifier
117-
118-
119114
def convert_repeated_capabilities(repeated_capability, prefix=''):
120115
'''Convert a repeated capabilities object to a comma delimited list
121116
@@ -129,10 +124,7 @@ def convert_repeated_capabilities(repeated_capability, prefix=''):
129124
# We need to explicitly handle None here. Everything else we can pass on to the singledispatch functions
130125
if repeated_capability is None:
131126
return []
132-
return [
133-
_add_repeated_capability_prefix(repeated_capability, prefix)
134-
for repeated_capability in _convert_repeated_capabilities(repeated_capability, prefix)
135-
]
127+
return [prefix + r for r in _convert_repeated_capabilities(repeated_capability, prefix)]
136128

137129

138130
def convert_repeated_capabilities_without_prefix(repeated_capability):

0 commit comments

Comments
 (0)