Update illegals (#70)

* fix illegals logic

* fix ruff

* fix dot

Author: ahartikainen

pyinfraformat/core/core.py

@@ -612,10 +612,6 @@ def add_survey(self, survey):
         """Add survey information to object."""
         self.survey.add(survey)
 
-    def _add_illegal(self, illegal):
-        """Add illegal lines to object."""
-        self._illegal.add(illegal)
-
     def plot(self, output="figure", figsize=(4, 4)):
         """
         Plot a diagram of a sounding with matplotlib.
@@ -660,17 +656,13 @@ def get_comments_list(self):
         """Get fileheader as a dict."""
         return self.inline_comment.data
 
-    def get_illegals_list(self):
-        """Get fileheader as a dict."""
-        return self._illegal.data
-
     def get_dict(self):
         """Get survey data, hole header, fileheader, comments and illegals as list of dicts."""
         d_header = self.get_header_dict()
         data_list = self.get_data_list()
         d_fileheader = self.get_fileheader_dict()
         comment_list = self.get_comments_list()
-        illegals_list = self.get_illegals_list()
+        illegals_list = self.illegals
         return {
             "header": d_header,
             "fileheader": d_fileheader,

pyinfraformat/core/io.py

@@ -457,7 +457,11 @@ def write_body(hole, f, comments=True, illegal=False, body_spacer=None, body_spa
 
     # Gather illegal lines
     if illegal:
-        for linenumber, line_string in hole._illegal.data:
+        illegals_dict = {
+            item["linenumber"]: item["line_highlighted"] + "  # " + item["error"]
+            for item in hole.illegals
+        }
+        for linenumber, line_string in illegals_dict.items():
             if int(linenumber) not in body_text:
                 body_text[int(line_dict["linenumber"])] = line_string
             else:

setup.py

@@ -1,32 +1,33 @@
 """Python setup information."""
 
-import codecs
 import os
 import re
+from pathlib import Path
 
 from setuptools import find_packages, setup
 
-PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
-REQUIREMENTS_FILE = os.path.join(PROJECT_ROOT, "requirements.txt")
-README_FILE = os.path.join(PROJECT_ROOT, "README.md")
-VERSION_FILE = os.path.join(PROJECT_ROOT, "pyinfraformat", "__init__.py")
+PROJECT_ROOT = Path(os.path.realpath(__file__)).parent
+REQUIREMENTS_FILE = PROJECT_ROOT / "requirements.txt"
+README_FILE = PROJECT_ROOT / "README.md"
+VERSION_FILE = PROJECT_ROOT / "pyinfraformat" / "__init__.py"
 
 
 def get_requirements():
     """Read contents from requirements.txt."""
-    with codecs.open(REQUIREMENTS_FILE) as buff:
+    with open(REQUIREMENTS_FILE, encoding="utf-8") as buff:
         return buff.read().splitlines()
 
 
 def get_long_description():
     """Read contents from README.md."""
-    with codecs.open(README_FILE, "rt") as buff:
+    with open(README_FILE, encoding="utf-8") as buff:
         return buff.read()
 
 
 def get_version():
     """Read version info from __init__.py."""
-    lines = open(VERSION_FILE).readlines()
+    with open(VERSION_FILE, encoding="utf-8") as buff:
+        lines = buff.readlines()
     version_regex = r"^__version__ = ['\"]([^'\"]*)['\"]"
     for line in lines:
         version_search = re.search(version_regex, line, re.MULTILINE)