Skip to content

Commit

Permalink
[pproc] fix issue #36 regular expression
Browse files Browse the repository at this point in the history
  • Loading branch information
nikohansen committed Jan 8, 2025
1 parent 7a0e28c commit ff3243b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/cocopp/pproc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,7 @@ def pickle(self, outputdir=None, gzipped=True):
f = open(self.pickleFile, 'w') # TODO: what if file already exist?
pickle.dump(self, f)
f.close()
if genericsettings.verbose:
if genericsettings.verbose > 0:
print('Saved pickle in %s.' %(self.pickleFile))
except IOError as e:
print("I/O error(%s): %s" % (e.errno, e.strerror))
Expand Down Expand Up @@ -2385,8 +2385,8 @@ def fallback():
# to be compatible with DataSet.__init__:
if not testbedsettings.current_testbed:
testbedsettings.load_current_testbed(dsl[0].suite_name, TargetValues)
# genericsettings.verbosity > 0 and
print(" using pickled DataSetList", end=' ') # remove when all went well for a while?
if genericsettings.verbose > 0:
print(" using pickled DataSetList {0}".format(name), end=' ')
return dsl
if _using_recommendations: # do not pickle recommendations for the time being
return fallback()
Expand Down Expand Up @@ -3484,7 +3484,7 @@ def parseinfo(s):
Keys should not use comma or quote characters.
"""
p = re.compile(r'\ *([^,=]+?)\ *=\ *(".+?"|\'.+?\'|[^,]+)\ *(?=,|$)')
p = re.compile(r'\ *([^,=]+?)\ *=\ *(".*?"|\'.*?\'|[^,]+)\ *(?=,|$)')
res = []
for elem0, elem1 in p.findall(s):
if elem1.startswith('\'') and elem1.endswith('\''): # HACK
Expand Down

0 comments on commit ff3243b

Please sign in to comment.