From 3199f6ab40a1c4a30ddba8bc76f4ee1b48eec65b Mon Sep 17 00:00:00 2001 From: Seth Ladygo Date: Fri, 18 Oct 2019 16:37:57 -0700 Subject: [PATCH] markup: move WORKDIR to utils.py --- markup/img.py | 6 +----- markup/pdf.py | 6 +----- markup/utils.py | 4 ++++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/markup/img.py b/markup/img.py index 86e4f77..9d01143 100644 --- a/markup/img.py +++ b/markup/img.py @@ -9,11 +9,7 @@ import dumper import random as rng from pathlib import Path -from django.conf import settings - -from .utils import cv2_rect, set_file_perms - -WORKDIR = os.path.join(settings.ASSET_DIR, 'markup', 'work') +from .utils import cv2_rect, ensure_dir, set_file_perms, WORKDIR # https://www.pyimagesearch.com/2014/10/20/finding-shapes-images-using-python-opencv/ diff --git a/markup/pdf.py b/markup/pdf.py index 905093d..a5a9c8a 100644 --- a/markup/pdf.py +++ b/markup/pdf.py @@ -7,11 +7,7 @@ from pdfminer.pdfparser import PDFParser from pdfminer.pdfdocument import PDFDocument from pdfminer.pdftypes import PDFObjRef, resolve1 -from django.conf import settings - -from .utils import pdf_rect, ensure_dir, set_file_perms - -WORKDIR = os.path.join(settings.ASSET_DIR, 'markup', 'work') +from .utils import pdf_rect, ensure_dir, set_file_perms, WORKDIR def make_product_box(obj, pagenum, mediabox): diff --git a/markup/utils.py b/markup/utils.py index f053d93..99ab4d5 100644 --- a/markup/utils.py +++ b/markup/utils.py @@ -1,6 +1,10 @@ import os import shutil +from django.conf import settings + +WORKDIR = os.path.join(settings.ASSET_DIR, 'markup', 'work') + def pdf_rect(rect, container_height): x1 = min(rect[0], rect[2])