diff options
| -rw-r--r-- | paper2remarkable/log.py | 9 | ||||
| -rw-r--r-- | paper2remarkable/providers/arxiv.py | 8 | ||||
| -rw-r--r-- | paper2remarkable/utils.py | 10 | ||||
| -rw-r--r-- | tests/test_providers.py | 5 |
4 files changed, 15 insertions, 17 deletions
diff --git a/paper2remarkable/log.py b/paper2remarkable/log.py index 3a2fcc5..fb9d8a3 100644 --- a/paper2remarkable/log.py +++ b/paper2remarkable/log.py @@ -38,7 +38,7 @@ class Logger(metaclass=Singleton): def disable(self): self.enabled = False - def _log(self, msg, mode, end='\n', add_prefix=True): + def _log(self, msg, mode, end="\n", add_prefix=True): if not self.enabled: return if not mode in ("info", "warn"): @@ -53,12 +53,11 @@ class Logger(metaclass=Singleton): print("%s%s" % (prefix, msg), end=end, file=file) file.flush() - def info(self, msg, end='\n'): + def info(self, msg, end="\n"): self._log(msg, "info", end=end) - def warning(self, msg, end='\n'): + def warning(self, msg, end="\n"): self._log(msg, "warn", end=end) - def append(self, msg, mode, end='\n'): + def append(self, msg, mode, end="\n"): self._log(msg, mode, end=end, add_prefix=False) - diff --git a/paper2remarkable/providers/arxiv.py b/paper2remarkable/providers/arxiv.py index 317452e..865a3f8 100644 --- a/paper2remarkable/providers/arxiv.py +++ b/paper2remarkable/providers/arxiv.py @@ -45,8 +45,8 @@ class Arxiv(Provider): def get_abs_pdf_urls(self, url): """Get the pdf and abs url from any given arXiv url """ - if '?' in url: - url = url[:url.index('?')] + if "?" in url: + url = url[: url.index("?")] if re.match(self.re_abs_1, url) or re.match(self.re_abs_2, url): abs_url = url pdf_url = url.replace("abs", "pdf") + ".pdf" @@ -119,8 +119,8 @@ class Arxiv(Provider): ) # remove the url (type 2, i.e. Jackson arXiv 0309285v2) block, n_subs3 = re.subn( - b"<<\n\/S \/URI\n" + - b"/URI \(" + b"<<\n\/S \/URI\n" + + b"/URI \(" + DEARXIV_URI_REGEX + b"\)\n>>\n", b"", diff --git a/paper2remarkable/utils.py b/paper2remarkable/utils.py index 07b1524..a29be3c 100644 --- a/paper2remarkable/utils.py +++ b/paper2remarkable/utils.py @@ -38,7 +38,7 @@ def clean_string(s): cleaned = "".join(c if c in allowed else "_" for c in normalized) while "__" in cleaned: cleaned = cleaned.replace("__", "_") - cleaned = cleaned.strip('_') + cleaned = cleaned.strip("_") return cleaned @@ -186,10 +186,10 @@ def check_pdftool(pdftk_path, qpdf_path): return "pdftk" try: status = subprocess.call( - [qpdf_path, "--help"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL, - ) + [qpdf_path, "--help"], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) except FileNotFoundError: status = 1 if status == 0: diff --git a/tests/test_providers.py b/tests/test_providers.py index b6cce59..546794c 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -285,8 +285,8 @@ class TestProviders(unittest.TestCase): def test_html_3(self): prov = HTML(upload=False, verbose=VERBOSE) url = "https://conclave-team.github.io/conclave-site/" - #exp = "Conclave_Case_Study_-_A_Private_and_Secure_Real-Time_Collaborative_Text_Editor.pdf" - # NOTE: Title differs between Readability.JS and readability-lxml, we + # exp = "Conclave_Case_Study_-_A_Private_and_Secure_Real-Time_Collaborative_Text_Editor.pdf" + # NOTE: Title differs between Readability.JS and readability-lxml, we # assume that testing is done with Readability.JS exp = "Conclave.pdf" filename = prov.run(url) @@ -337,6 +337,5 @@ class TestProviders(unittest.TestCase): self.assertEqual(exp, os.path.basename(filename)) - if __name__ == "__main__": unittest.main() |