Skip to content

Fix invalid regex escapes #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maltelau wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix invalid regex escapes #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stormdb/access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def filter_series(self,
key_val_pair[1].sort(key=lambda x: os.path.splitext(x)[0])

elif 'path' in key_val_pair[0]:
m = re.search('\d{3}\.(.+?)/files', key_val_pair[1])
m = re.search('\\d{3}\.(.+?)/files', key_val_pair[1])
info.append(['seriename', m.group(1)])
info.append(key_val_pair)
info_dict = {key: value for (key, value) in info}
Expand Down
8 changes: 4 additions & 4 deletions stormdb/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def get_memlimit_per_process(self, queue):
lim = self._query('qconf -sq ' + queue +
'| grep h_vmem | awk {\'print $2\'}')[0]

_, lim_int, lim_units = re.split('(\d+)', lim)
_, lim_int, lim_units = re.split('(\\d+)', lim)
assert isinstance(int(lim_int), int)
assert isinstance(lim_units, string_types)

Expand Down Expand Up @@ -238,8 +238,8 @@ def __init__(self,
'Maximum number of parallel threads is one (1) when total '
'memory consumption is specified.')
# XXX would be nice with some sanity checking here...
_, totmem, totmem_unit = re.split('(\d+)', self.total_memory)
_, memlim, memlim_unit = re.split('(\d+)', h_vmem)
_, totmem, totmem_unit = re.split('(\\d+)', self.total_memory)
_, memlim, memlim_unit = re.split('(\\d+)', h_vmem)

if totmem_unit != memlim_unit:
units = dict(k=1e3, m=1e6, g=1e9, t=1e12)
Expand Down Expand Up @@ -365,7 +365,7 @@ def submit(self, fake=False, sh_file='~/submit_job.sh'):
else:
# py2-3 safety
output = output.decode('ascii', 'ignore').rstrip()
m = re.search('(\d+)', output)
m = re.search('(\\d+)', output)
self._jobid = m.group(1)
if self._cleanup_qsub_job:
self._delete_qsub_job()
Expand Down