From 32bd87ff7d8dda8ce759e9826ac59e155dd8a14f Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 24 Feb 2023 13:15:46 +0100 Subject: [PATCH 1/2] Arch: Removed six module --- src/Mod/Arch/ArchAxis.py | 1 - src/Mod/Arch/exportIFC.py | 1 - src/Mod/Arch/importIFC.py | 1 - src/Mod/Arch/importIFCHelper.py | 1 - src/Mod/Arch/importJSON.py | 1 - src/Mod/Arch/importWebGL.py | 7 ++++++- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py index eab3895d9f..a535d6c4a1 100644 --- a/src/Mod/Arch/ArchAxis.py +++ b/src/Mod/Arch/ArchAxis.py @@ -19,7 +19,6 @@ #* * #*************************************************************************** -import six import FreeCAD, Part, Draft, math, ArchCommands from FreeCAD import Vector diff --git a/src/Mod/Arch/exportIFC.py b/src/Mod/Arch/exportIFC.py index f30ca2a6b2..8b087bc4db 100644 --- a/src/Mod/Arch/exportIFC.py +++ b/src/Mod/Arch/exportIFC.py @@ -30,7 +30,6 @@ Internally it uses IfcOpenShell, which must be installed before using. from __future__ import print_function -import six import os import time import tempfile diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 342490093d..62580db3d8 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -30,7 +30,6 @@ Internally it uses IfcOpenShell, which must be installed before using. from __future__ import print_function -import six import os import math import time diff --git a/src/Mod/Arch/importIFCHelper.py b/src/Mod/Arch/importIFCHelper.py index 2ccb49a695..7731644c12 100644 --- a/src/Mod/Arch/importIFCHelper.py +++ b/src/Mod/Arch/importIFCHelper.py @@ -21,7 +21,6 @@ """Helper functions that are used by IFC importer and exporter.""" import sys import math -import six import FreeCAD import Arch diff --git a/src/Mod/Arch/importJSON.py b/src/Mod/Arch/importJSON.py index 7899f2f9e4..263e1b08c8 100644 --- a/src/Mod/Arch/importJSON.py +++ b/src/Mod/Arch/importJSON.py @@ -23,7 +23,6 @@ import FreeCAD, Mesh, Draft, Part import json -import six if FreeCAD.GuiUp: import FreeCADGui diff --git a/src/Mod/Arch/importWebGL.py b/src/Mod/Arch/importWebGL.py index 7f4dc2bfdd..3b486abc55 100644 --- a/src/Mod/Arch/importWebGL.py +++ b/src/Mod/Arch/importWebGL.py @@ -37,7 +37,12 @@ """FreeCAD WebGL Exporter""" -import FreeCAD,Mesh,Draft,Part,OfflineRenderingUtils,json,six +import FreeCAD +import Mesh +import Draft +import Part +import OfflineRenderingUtils +import json import textwrap if FreeCAD.GuiUp: From 420636a51cc13562b931dc197b321cc738917a6f Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 24 Feb 2023 13:20:58 +0100 Subject: [PATCH 2/2] Draft: Removed six module --- src/Mod/Draft/draftfunctions/svgtext.py | 1 - src/Mod/Draft/draftutils/todo.py | 2 -- src/Mod/Draft/draftutils/translate.py | 1 - src/Mod/Draft/importDWG.py | 1 - src/Mod/Draft/importDXF.py | 36 ++++++++++++------------- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/Mod/Draft/draftfunctions/svgtext.py b/src/Mod/Draft/draftfunctions/svgtext.py index 2213c00c5a..b470a42eca 100644 --- a/src/Mod/Draft/draftfunctions/svgtext.py +++ b/src/Mod/Draft/draftfunctions/svgtext.py @@ -27,7 +27,6 @@ # \brief Provides functions to return the SVG representation of text elements. import math -import six import FreeCAD as App import draftutils.utils as utils diff --git a/src/Mod/Draft/draftutils/todo.py b/src/Mod/Draft/draftutils/todo.py index 489db75404..b30664aa0d 100644 --- a/src/Mod/Draft/draftutils/todo.py +++ b/src/Mod/Draft/draftutils/todo.py @@ -34,8 +34,6 @@ to execute the instructions stored in internal lists. # \ingroup draftutils # \brief Provides the ToDo static class to run commands with a time delay. -import six -import sys import traceback import PySide.QtCore as QtCore diff --git a/src/Mod/Draft/draftutils/translate.py b/src/Mod/Draft/draftutils/translate.py index 2e0cbebb66..d6d0f0a0ff 100644 --- a/src/Mod/Draft/draftutils/translate.py +++ b/src/Mod/Draft/draftutils/translate.py @@ -34,7 +34,6 @@ using the QtCore module. # @{ import PySide.QtCore as QtCore import PySide.QtGui as QtGui -import six Qtranslate = QtCore.QCoreApplication.translate diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py index 45bbd45d0a..1b71d85c35 100644 --- a/src/Mod/Draft/importDWG.py +++ b/src/Mod/Draft/importDWG.py @@ -44,7 +44,6 @@ https://knowledge.autodesk.com/support/autocad/downloads/ # * * # *************************************************************************** -import six import FreeCAD from FreeCAD import Console as FCC diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 1ae4772e6c..e9289eb182 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -50,11 +50,17 @@ texts, colors,layers (from groups) TEXTSCALING = 1.35 CURRENTDXFLIB = 1.40 -import sys, os, math, re -import six +import sys +import os +import math +import re import FreeCAD -import Part, Draft, Mesh -import DraftVecUtils, DraftGeomUtils, WorkingPlane +import Part +import Draft +import Mesh +import DraftVecUtils +import DraftGeomUtils +import WorkingPlane from Draft import _Dimension from FreeCAD import Vector from FreeCAD import Console as FCC @@ -263,22 +269,16 @@ def deformat(text): sts = re.split("\\\\(U\+....)", t) ns = u"" for ss in sts: - # print(ss, type(ss)) - if ss.startswith("U+"): - ucode = "0x" + ss[2:] - # In Python3 unichr doesn't exist anymore - ns += six.unichr(eval(ucode)) - else: + try: + ns += ss.decode("utf8") + except UnicodeError: try: - ns += ss.decode("utf8") + ns += ss.decode("latin1") except UnicodeError: - try: - ns += ss.decode("latin1") - except UnicodeError: - print("unable to decode text: ", text) - except AttributeError: - # this is python3 (nothing to do) - ns += ss + print("unable to decode text: ", text) + except AttributeError: + # this is python3 (nothing to do) + ns += ss t = ns # replace degrees, diameters chars t = re.sub('%%d', u'°', t)