aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2020-01-07 15:16:46 +0000
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2020-01-07 15:16:46 +0000
commit89dbdd84c5afcb509ff27dbb7026245eb20b1576 (patch)
tree5a5e72317bc171c71176dd8654159bdf999c7b34
parentRaise exceptions instead of hard exiting (diff)
downloadpaper2remarkable-89dbdd84c5afcb509ff27dbb7026245eb20b1576.tar.gz
paper2remarkable-89dbdd84c5afcb509ff27dbb7026245eb20b1576.zip
Move exception function to ui.py
This is the only valid place to use it now.
-rw-r--r--paper2remarkable/ui.py16
-rw-r--r--paper2remarkable/utils.py13
2 files changed, 14 insertions, 15 deletions
diff --git a/paper2remarkable/ui.py b/paper2remarkable/ui.py
index 2a30e7f..6343077 100644
--- a/paper2remarkable/ui.py
+++ b/paper2remarkable/ui.py
@@ -9,11 +9,12 @@ Copyright: 2019, G.J.J. van den Burg
"""
import argparse
+import sys
-from . import __version__
+from . import __version__, GITHUB_URL
from .providers import providers, LocalFile
-from .utils import exception, follow_redirects
+from .utils import follow_redirects
def parse_args():
@@ -83,6 +84,17 @@ def parse_args():
return parser.parse_args()
+def exception(msg):
+ print("ERROR: " + msg, file=sys.stderr)
+ print("Error occurred. Exiting.", file=sys.stderr)
+ print("", file=sys.stderr)
+ print(
+ "If you think this might be a bug, please raise an issue on GitHub: %s"
+ % GITHUB_URL
+ )
+ raise SystemExit(1)
+
+
def main():
args = parse_args()
diff --git a/paper2remarkable/utils.py b/paper2remarkable/utils.py
index 7d68964..4d42f23 100644
--- a/paper2remarkable/utils.py
+++ b/paper2remarkable/utils.py
@@ -12,11 +12,9 @@ import PyPDF2
import requests
import string
import subprocess
-import sys
import time
import unidecode
-from . import GITHUB_URL
from .log import Logger
from .exceptions import FileTypeError, RemarkableError
@@ -30,17 +28,6 @@ HEADERS = {
logger = Logger()
-def exception(msg):
- print("ERROR: " + msg, file=sys.stderr)
- print("Error occurred. Exiting.", file=sys.stderr)
- print("", file=sys.stderr)
- print(
- "If you think this might be a bug, please raise an issue on GitHub: %s"
- % GITHUB_URL
- )
- raise SystemExit(1)
-
-
def clean_string(s):
""" Clean a string by replacing accented characters with equivalents and
keeping only the allowed characters (ascii letters, digits, underscore,