Correct errors

Author: johnsamuelwrites

.github/workflows/pythonpackage.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.9 3.10 3.11]
 
     steps:
     - uses: actions/checkout@v2

backend/api/main.py

@@ -16,8 +16,7 @@
 
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
-from fastapi.staticfiles import StaticFiles
+from fastapi.responses import JSONResponse, RedirectResponse
 
 from api.routes import convert, export, health, validate
 from shexstatements.parser_cache import ParserCache

backend/api/models/__init__.py

@@ -6,7 +6,7 @@
 
 """API models package."""
 
-from .requests import ConvertRequest, ValidateRequest, ExportRequest
+from .requests import ConvertRequest, ExportRequest, ValidateRequest
 from .responses import (
     ConvertResponse,
     ValidateResponse,

backend/api/routes/export.py

@@ -286,12 +286,12 @@ def _to_shacl(shapes: dict, original_shex: str) -> str:
             separator = ";" if i < len(props) - 1 else "."
             prop_name = prop["name"]
 
-            lines.append(f"    sh:property [")
+            lines.append("    sh:property [")
             lines.append(f"        sh:path {prop_name} ;")
 
             # Add datatype or node constraint
             if prop["type"] == "LITERAL":
-                lines.append(f"        sh:datatype xsd:string ;")
+                lines.append("        sh:datatype xsd:string ;")
             elif prop["type"].startswith("xsd:"):
                 lines.append(f"        sh:datatype {prop['type']} ;")
             elif prop["type"].startswith("@<"):
@@ -301,12 +301,12 @@ def _to_shacl(shapes: dict, original_shex: str) -> str:
             # Add cardinality
             card = prop["cardinality"]
             if card == "+":
-                lines.append(f"        sh:minCount 1 ;")
+                lines.append("        sh:minCount 1 ;")
             elif card == "?":
-                lines.append(f"        sh:maxCount 1 ;")
+                lines.append("        sh:maxCount 1 ;")
             elif card == "":
-                lines.append(f"        sh:minCount 1 ;")
-                lines.append(f"        sh:maxCount 1 ;")
+                lines.append("        sh:minCount 1 ;")
+                lines.append("        sh:maxCount 1 ;")
 
             lines.append(f"    ] {separator}")
 

backend/api/services/converter.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 from typing import Literal
 
-from api.models.responses import ConvertResponse, ParseError, Warning
+from api.models.responses import ConvertResponse, ParseError
 from shexstatements.errors import UnrecognizedCharacterError
 from shexstatements.shexfromcsv import CSV
 

backend/shexstatements/cliargs.py

@@ -5,14 +5,14 @@
 #
 
 import argparse
+import runpy
+from os.path import splitext
+
+import shexstatements.application
+from shexstatements.shexfromapplprofilecsv import ApplicationProfile
 from shexstatements.shexfromcsv import CSV
-from shexstatements.shexjfromcsv import ShExJCSV
 from shexstatements.shexfromspreadsheet import Spreadsheet
-from shexstatements.shexfromapplprofilecsv import ApplicationProfile
-import shexstatements.application
-from os.path import splitext
-import setuptools
-import runpy
+from shexstatements.shexjfromcsv import ShExJCSV
 
 
 def handle_cli_arguments(arguments):

backend/shexstatements/errors.py

@@ -14,12 +14,12 @@ def __init__(self, message):
 
         Parameters
         ----------
-            self :   
+            self :
               The name to use.
             message:  str
                error message
         """
-        super(UnrecognizedCharacterError, self).__init__(message)
+        super().__init__(message)
         self.message = message
 
 
@@ -34,10 +34,10 @@ def __init__(self, message):
 
         Parameters
         ----------
-            self :   
+            self :
               The name to use.
             message:  str
                error message
         """
-        super(ParserError, self).__init__(message)
+        super().__init__(message)
         self.message = message

backend/shexstatements/shexfromapplprofilecsv.py

@@ -5,8 +5,7 @@
 #
 
 import csv
-import re
-from shexstatements.shexstatementsparser import ShExStatementLexerParser
+
 from shexstatements.shexfromcsv import CSV
 
 """
@@ -16,13 +15,13 @@
 DCAP term : ShExStatements
 ==========================
 Entityname    : Node name
-Property      : Property 
-PropertyLabel :	
+Property      : Property
+PropertyLabel :
 Mand          : Cardinality
 Repeat        : Cardinality
 Value         : Value
 Valuetype     : Value
-Annotation    :	Annotation
+Annotation    : Annotation
 
 """
 
@@ -40,7 +39,7 @@ def generate_shex_from_csv(filepath, delim=",", skip_header=False):
           filepath : str
             This parameter can contain either a file path of a CSV file or shexstatements in CSV format.
           delim : str
-            a delimiter. Allowed values include ',', '|' and ';' 
+            a delimiter. Allowed values include ',', '|' and ';'
           skip_header : bool
             if the first line is a header, set this value to True. By default, the value is False.
 
@@ -53,7 +52,7 @@ def generate_shex_from_csv(filepath, delim=",", skip_header=False):
         shexstatement = ""
         try:
             data = ""
-            with open(filepath, 'r') as csvfile:
+            with open(filepath) as csvfile:
                 csvreader = csv.reader(csvfile, delimiter=delim)
                 rowno = 0
                 shapename = ""

backend/shexstatements/shexfromcsv.py

@@ -6,9 +6,10 @@
 
 import csv
 import re
-from shexstatements.shexstatementsparser import ShExStatementLexerParser
 from io import StringIO
 
+from shexstatements.shexstatementsparser import ShExStatementLexerParser
+
 
 class CSV:
     """
@@ -35,7 +36,7 @@ def generate_shex_from_data_string(data):
             lexerparser = ShExStatementLexerParser()
             lexerparser.build()
             lexerparser.buildparser()
-            tokens = lexerparser.input(data)
+            lexerparser.input(data)
             result = lexerparser.parse(data)
             shexstatement = result.generate_shex()
         except Exception as e:
@@ -52,7 +53,7 @@ def generate_shex_from_csv(filepath, delim=",", skip_header=False, filename=True
           filepath : str
             This parameter can contain either a file path of a CSV file or shexstatements in CSV format.
           delim : str
-            a delimiter. Allowed values include ',', '|' and ';' 
+            a delimiter. Allowed values include ',', '|' and ';'
           skip_header : bool
             if the first line is a header, set this value to True. By default, the value is False.
           filename : bool
@@ -66,10 +67,10 @@ def generate_shex_from_csv(filepath, delim=",", skip_header=False, filename=True
         """
         shexstatement = ""
         try:
-            pattern = '^\s*$'
+            pattern = r'^\s*$'
             data = ""
             if filename:
-                csvfile = open(filepath, 'r')
+                csvfile = open(filepath)
                 csvreader = csv.reader(csvfile, delimiter=delim)
             else:
                 # It's a multi-line string

backend/shexstatements/shexfromspreadsheet.py

@@ -4,13 +4,15 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
+from os import remove
+from os.path import splitext
+
+from odf.opendocument import load
+from odf.table import TableCell, TableRow
 from openpyxl import load_workbook
 from xlrd import open_workbook
-from os.path import splitext
-from odf.opendocument import OpenDocumentSpreadsheet, load
-from odf.table import Table, TableCell, TableRow
+
 from shexstatements.shexfromcsv import CSV
-from os import remove
 
 
 class Spreadsheet:
@@ -39,11 +41,10 @@ def generate_shex_from_spreadsheet(filepath, skip_header=False, stream=None):
         """
         shexstatement = ""
         try:
-            pattern = '^\s*$'
             data = ""
-            filename, file_extension = splitext(filepath)
+            _, file_extension = splitext(filepath)
 
-            if(file_extension in {".xlsx", ".xlsm", ".xltx", ".xltm"}):
+            if file_extension in {".xlsx", ".xlsm", ".xltx", ".xltm"}:
                 wb = None
                 if stream is not None:
                     with open("tmp" + filepath, "wb") as sf:
@@ -54,7 +55,7 @@ def generate_shex_from_spreadsheet(filepath, skip_header=False, stream=None):
                 wb = load_workbook(filepath)
                 for ws in wb.worksheets:
                     for i in range(1, ws.max_row+1):
-                        line = list()
+                        line = []
                         for j in range(1, ws.max_column+1):
                             cell = ws.cell(row=i, column=j).value
                             if cell is not None:
@@ -65,23 +66,23 @@ def generate_shex_from_spreadsheet(filepath, skip_header=False, stream=None):
                 if stream is not None:
                     remove(filepath)
 
-            elif(file_extension in {".xls"}):
+            elif file_extension in {".xls"}:
                 wb = None
                 if stream is not None:
-                    #wb = open_workbook(file_contents=stream, encoding_override="cp1252")
+                    # wb = open_workbook(file_contents=stream, encoding_override="cp1252")
                     wb = open_workbook(file_contents=stream)
                 else:
                     wb = open_workbook(filepath)
                 for sheet in wb.sheets():
                     for i in range(0, wb.sheets()[0].nrows):
-                        line = list()
+                        line = []
                         for j in range(0, wb.sheets()[0].ncols):
                             cell = sheet.cell(i, j).value
                             if len(str(cell)) > 0:
                                 line.append(cell)
                         data = data + "|".join(line) + "\n"
 
-            elif(file_extension in {".ods"}):
+            elif file_extension in {".ods"}:
                 wb = None
                 if stream is not None:
                     with open("tmp" + filepath, "wb") as sf:
@@ -94,7 +95,7 @@ def generate_shex_from_spreadsheet(filepath, skip_header=False, stream=None):
                 rows = wb.getElementsByType(TableRow)
                 for row in rows:
                     cells = row.getElementsByType(TableCell)
-                    line = list()
+                    line = []
                     for cell in cells:
                         if len(str(cell)) > 0:
                             line.append(str(cell))