From 0678a8118ae38befed73c3610186192b2b87fe0a Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 3 Aug 2016 20:29:36 +0200 Subject: [PATCH] Properly escape \ in regex string --- .travis.yml | 2 +- instaloader.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 888006b..b40e7bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ python: install: - pip install pylint requests script: - - python3 -m pylint -r n -d bad-whitespace,bad-continuation,missing-docstring,anomalous-backslash-in-string,multiple-imports,locally-disabled instaloader + - python3 -m pylint -r n -d bad-whitespace,bad-continuation,missing-docstring,multiple-imports,locally-disabled instaloader diff --git a/instaloader.py b/instaloader.py index 2d00254..ae363b2 100755 --- a/instaloader.py +++ b/instaloader.py @@ -49,7 +49,7 @@ def get_json(name, session, max_id=0, sleep=True): params={'max_id': max_id}) if sleep: time.sleep(4 * random.random() + 1) - match = re.search('window\._sharedData = .*<', resp.text) + match = re.search('window\\._sharedData = .*<', resp.text) if match is None: return None else: @@ -91,7 +91,7 @@ def epoch_to_string(epoch): return datetime.datetime.fromtimestamp(epoch).strftime('%Y-%m-%d_%H-%M-%S') def get_file_extension(url): - match = re.search('\.[a-z]*\?', url) + match = re.search('\\.[a-z]*\\?', url) if match is None: return url[-3:] else: @@ -207,7 +207,7 @@ def download_profilepic(name, url, quiet=False): if os.path.isfile(filename): log(filename + ' already exists', quiet=quiet) return None - match = re.search('http.*://.*instagram.*[^/]*\.(com|net)/[^/]+/.', url) + match = re.search('http.*://.*instagram.*[^/]*\\.(com|net)/[^/]+/.', url) if match is None: raise ConnectionException("URL \'" + url + "\' could not be processed.") index = len(match.group(0))-1