Merge pull request #68 from ndokter/revert-57-master
Revert "fix for empty parentheses in ProfileGenericParser"
This commit is contained in:
commit
602129a665
@ -225,11 +225,6 @@ class ProfileGenericParser(DSMRObjectParser):
|
||||
self.parsers_for_unidentified = parsers_for_unidentified
|
||||
|
||||
def _is_line_wellformed(self, line, values):
|
||||
|
||||
# allow empty parentheses (indicated by empty string)
|
||||
if values and (len(values) == 1) and (values[0] == ''):
|
||||
return True
|
||||
|
||||
if values and (len(values) >= 2) and (values[0].isdigit()):
|
||||
buffer_length = int(values[0])
|
||||
return (buffer_length <= 10) and (len(values) == (buffer_length * 2 + 2))
|
||||
@ -237,10 +232,6 @@ class ProfileGenericParser(DSMRObjectParser):
|
||||
return False
|
||||
|
||||
def _parse_values(self, values):
|
||||
# in case of empty parentheses return
|
||||
if values and (len(values) == 1) and (values[0] == None):
|
||||
return super()._parse_values(values) #calling parent
|
||||
|
||||
buffer_length = int(values[0])
|
||||
buffer_value_obis_ID = values[1]
|
||||
if (buffer_length > 0):
|
||||
|
Loading…
Reference in New Issue
Block a user