aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdam Janovsky2020-11-24 11:41:24 +0100
committerAdam Janovsky2020-11-24 11:41:24 +0100
commit88a282d1957cb02e5e234e6dab7414d7af98a9c0 (patch)
tree26b1b3422bb79ec460d5d9461acf99ed36327afe
parentd73f9adf65ce237e026814fa4175533dcfc84b82 (diff)
downloadsec-certs-88a282d1957cb02e5e234e6dab7414d7af98a9c0.tar.gz
sec-certs-88a282d1957cb02e5e234e6dab7414d7af98a9c0.tar.zst
sec-certs-88a282d1957cb02e5e234e6dab7414d7af98a9c0.zip
Repalce relative imports with absolute imports
Done only in OOP parts of the repository. Plus, modified a `process_certificates.py` to append to syspath, so that it can be run from the `./sec-certs` dir.
-rw-r--r--sec_certs/certificate.py7
-rw-r--r--sec_certs/constants.py2
-rw-r--r--sec_certs/dataset.py29
-rwxr-xr-xsec_certs/fips_certificates.py1
-rw-r--r--sec_certs/helpers.py2
-rwxr-xr-xsec_certs/process_certificates.py16
-rw-r--r--sec_certs/serialization.py5
7 files changed, 34 insertions, 28 deletions
diff --git a/sec_certs/certificate.py b/sec_certs/certificate.py
index 2840cc75..9d3fc3e3 100644
--- a/sec_certs/certificate.py
+++ b/sec_certs/certificate.py
@@ -4,11 +4,12 @@ from dataclasses import dataclass
import logging
from pathlib import Path
import os
-
-from . import helpers, extract_certificates
+from typing import Union, Optional, List, Dict, ClassVar
from abc import ABC, abstractmethod
+
from bs4 import Tag, BeautifulSoup, NavigableString
-from typing import Union, Optional, List, Dict, ClassVar
+
+from sec_certs import helpers, extract_certificates
class Certificate(ABC):
diff --git a/sec_certs/constants.py b/sec_certs/constants.py
index d8a80fa3..3ffb867c 100644
--- a/sec_certs/constants.py
+++ b/sec_certs/constants.py
@@ -1,8 +1,6 @@
from enum import Enum
-
-
class CertFramework(Enum):
CC = 'Common Criteria'
FIPS = 'FIPS'
diff --git a/sec_certs/dataset.py b/sec_certs/dataset.py
index 785e3977..6f0912cd 100644
--- a/sec_certs/dataset.py
+++ b/sec_certs/dataset.py
@@ -1,26 +1,25 @@
import os
import re
-from datetime import datetime, date
-
-from tabula import read_pdf
-
-from .certificate import CommonCriteriaCert, Certificate, FIPSCertificate
-from .extract_certificates import extract_certificates_keywords
-from .constants import FIPS_NOT_AVAILABLE_CERT_SIZE
+from datetime import datetime
+import locale
+import logging
+from typing import Dict, List, ClassVar
+import json
+from importlib import import_module
from abc import ABC, abstractmethod
-from . import helpers as helpers
from pathlib import Path
import shutil
+
+from tabula import read_pdf
import pandas as pd
from bs4 import BeautifulSoup
-import locale
-import logging
-from typing import Dict, List, Optional, Set, ClassVar
-import json
-from importlib import import_module
-from .files import search_files
-from .helpers import find_tables, repair_pdf
+from sec_certs.files import search_files
+from sec_certs import helpers as helpers
+from sec_certs.helpers import find_tables, repair_pdf
+from sec_certs.certificate import CommonCriteriaCert, Certificate, FIPSCertificate
+from sec_certs.extract_certificates import extract_certificates_keywords
+from sec_certs.constants import FIPS_NOT_AVAILABLE_CERT_SIZE
class Dataset(ABC):
diff --git a/sec_certs/fips_certificates.py b/sec_certs/fips_certificates.py
index 22b055a8..8d529c4a 100755
--- a/sec_certs/fips_certificates.py
+++ b/sec_certs/fips_certificates.py
@@ -19,6 +19,7 @@ from .files import load_json_files, FILE_ERRORS_STRATEGY, search_files
FIPS_BASE_URL = 'https://csrc.nist.gov'
FIPS_MODULE_URL = 'https://csrc.nist.gov/projects/cryptographic-module-validation-program/certificate/'
+
def extract_filename(file: str) -> str:
"""
Extracts filename from path
diff --git a/sec_certs/helpers.py b/sec_certs/helpers.py
index 50518911..dd95b0c8 100644
--- a/sec_certs/helpers.py
+++ b/sec_certs/helpers.py
@@ -1,6 +1,5 @@
import re
from typing import Sequence, Tuple, Optional, Set, List, Dict
-
import logging
import pikepdf
import requests
@@ -16,7 +15,6 @@ import pandas as pd
from bs4 import Tag, NavigableString
-
def download_file(url: str, output: Path) -> int:
r = requests.get(url, allow_redirects=True)
with output.open('wb') as f:
diff --git a/sec_certs/process_certificates.py b/sec_certs/process_certificates.py
index 9ce784a7..ceffface 100755
--- a/sec_certs/process_certificates.py
+++ b/sec_certs/process_certificates.py
@@ -1,11 +1,19 @@
#!/usr/bin/env python3
+import sys
+import os
+
+PACKAGE_PARENT = '..'
+SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
+sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
+
+
import click
-from .files import load_json_files
-from .extract_certificates import *
-from .analyze_certificates import *
-from .download import download_cc_web, download_cc
+from sec_certs.files import load_json_files
+from sec_certs.extract_certificates import *
+from sec_certs.analyze_certificates import *
+from sec_certs.download import download_cc_web, download_cc
@click.command()
diff --git a/sec_certs/serialization.py b/sec_certs/serialization.py
index 8283ac35..15c38a7b 100644
--- a/sec_certs/serialization.py
+++ b/sec_certs/serialization.py
@@ -1,8 +1,9 @@
import json
from datetime import date
from pathlib import Path
-from .dataset import CCDataset, FIPSDataset
-from .certificate import CommonCriteriaCert, FIPSCertificate
+
+from sec_certs.dataset import CCDataset, FIPSDataset
+from sec_certs.certificate import CommonCriteriaCert, FIPSCertificate
serializable_complex_types = (
CCDataset, FIPSDataset, CommonCriteriaCert, CommonCriteriaCert.MaintainanceReport, CommonCriteriaCert.ProtectionProfile,