kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Arch] remove unneeded checks for Python 3

Browse Source 
since we only support Python >=3, these checks can go
This commit is contained in:
Uwe
2022-07-31 05:35:58 +02:00
parent 9884073276
commit 04570f81cc
10 changed files with 18 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Arch/ArchCommands.py
View File

@@ -20,7 +20,6 @@
#* *
#***************************************************************************
import sys
import FreeCAD,Draft,ArchComponent,DraftVecUtils
from FreeCAD import Vector
if FreeCAD.GuiUp:
@@ -60,8 +59,6 @@ def string_replace(text, pattern, replacement):
u'abc mm \xc2\xb3'
```
"""
if sys.version_info.major < 3:
text = text.encode("utf8")
return text.replace(pattern, replacement)
@@ -937,8 +934,6 @@ def survey(callback=False):
if FreeCAD.SurveyObserver.totalLength:
u = FreeCAD.Units.Quantity(FreeCAD.SurveyObserver.totalLength,FreeCAD.Units.Length)
t = u.getUserPreferred()[0]
if sys.version_info.major < 3:
t = t.encode("utf8")
msg += " Length: " + t
if FreeCAD.SurveyObserver.totalArea:
u = FreeCAD.Units.Quantity(FreeCAD.SurveyObserver.totalArea,FreeCAD.Units.Area)
@@ -1045,8 +1040,6 @@ class SurveyTaskPanel:
if hasattr(FreeCAD,"SurveyObserver"):
u = FreeCAD.Units.Quantity(FreeCAD.SurveyObserver.totalLength,FreeCAD.Units.Length)
t = u.getUserPreferred()[0]
if sys.version_info.major < 3:
t = t.encode("utf8")
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch").GetBool("surveyUnits",True):
QtGui.QApplication.clipboard().setText(t)
else:
@@ -1110,10 +1103,7 @@ class SurveyTaskPanel:
if rows:
filename = QtGui.QFileDialog.getSaveFileName(QtGui.QApplication.activeWindow(), translate("Arch","Export CSV File"), None, "CSV file (*.csv)");
if filename:
if sys.version_info.major < 3:
mode = 'wb'
else:
mode = 'w'
mode = 'w'
with open(filename[0].encode("utf8"), mode) as csvfile:
csvfile = csv.writer(csvfile,delimiter="\t")
suml = 0
@@ -1330,15 +1320,11 @@ def getExtrusionData(shape,sortmethod="area"):
def printMessage( message ):
FreeCAD.Console.PrintMessage( message )
if FreeCAD.GuiUp :
if sys.version_info.major < 3:
message = message.decode("utf8")
QtGui.QMessageBox.information( None , "" , message )
def printWarning( message ):
FreeCAD.Console.PrintMessage( message )
if FreeCAD.GuiUp :
if sys.version_info.major < 3:
message = message.decode("utf8")
QtGui.QMessageBox.warning( None , "" , message )