From 8dc5bd11c7de301a70fd5e2b5cf36e84590c2c69 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Fri, 23 Oct 2020 12:24:50 +0200
Subject: Code formatting

---
 paper2remarkable/log.py             |  9 ++++-----
 paper2remarkable/providers/arxiv.py |  8 ++++----
 paper2remarkable/utils.py           | 10 +++++-----
 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()
-- 
cgit v1.2.3


From 015f229b7706390fd5dadb8701e382d19fae4f68 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Fri, 23 Oct 2020 12:38:36 +0200
Subject: Add pre-commit config for code formatting

This is mainly to try out pre-commit
---
 .pre-commit-config.yaml | 6 ++++++
 .travis.yml             | 2 ++
 pyproject.toml          | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 pyproject.toml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..3cb791c
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+  - repo: https://github.com/psf/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+        language_version: python3
diff --git a/.travis.yml b/.travis.yml
index 6a57cd3..32a2a1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,9 @@ before_install:
   - nvm use v12.18.1
 
 install:
+  - pip install pre-commit
   - pip install -e .[test]
 
 script:
+  - pre-commit run --all-files --show-diff-on-failure
   - green -vv -a ./tests
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..a8f43fe
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,2 @@
+[tool.black]
+line-length = 79
-- 
cgit v1.2.3