From 3fe026f3c989b091623f4185749b88afee77bfe3 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Mon, 7 Nov 2022 21:52:24 -0600
Subject: [PATCH] Remove various sys.version_info >= 3 checks

---
 src/App/FreeCADInit.py            | 4 +---
 src/Base/GeometryPyCXX.cpp        | 8 +-------
 src/Mod/OpenSCAD/OpenSCADUtils.py | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py
index 1382997b27..e425c16e1b 100644
--- a/src/App/FreeCADInit.py
+++ b/src/App/FreeCADInit.py
@@ -359,8 +359,6 @@ class FCADLogger(object):
         build.
     '''
 
-    _string_type = str if sys.version_info[0] >= 3 else basestring
-
     _levels = { 'Error':0, 'error':0,
                 'Warning':1, 'warn':1,
                 'Message':2, 'msg':2, 'info':2,
@@ -529,7 +527,7 @@ class FCADLogger(object):
                      string.format()
         '''
 
-        if (args or kargs) and isinstance(msg,self.__class__._string_type):
+        if (args or kargs) and isinstance(msg,str):
             if not kargs:
                 msg = msg.format(*args)
             else:
diff --git a/src/Base/GeometryPyCXX.cpp b/src/Base/GeometryPyCXX.cpp
index c0a30195e5..3cf5f0486b 100644
--- a/src/Base/GeometryPyCXX.cpp
+++ b/src/Base/GeometryPyCXX.cpp
@@ -155,13 +155,7 @@ Py::Object Vector2dPy::getattro(const Py::String &name_)
     //
     std::string name( name_.as_std_string( "utf-8" ) );
 
-    if (name == "__members__") { // Py2
-        Py::List attr;
-        attr.append(Py::String("x"));
-        attr.append(Py::String("y"));
-        return attr;
-    }
-    else if (name == "__dict__") { // Py3
+    if (name == "__dict__") {
         Py::Dict attr;
         attr.setItem(Py::String("x"), Py::Float(v.x));
         attr.setItem(Py::String("y"), Py::Float(v.y));
diff --git a/src/Mod/OpenSCAD/OpenSCADUtils.py b/src/Mod/OpenSCAD/OpenSCADUtils.py
index 9cdbfa80dc..148bc1a090 100644
--- a/src/Mod/OpenSCAD/OpenSCADUtils.py
+++ b/src/Mod/OpenSCAD/OpenSCADUtils.py
@@ -95,7 +95,7 @@ def searchforopenscadexe():
                 stdout=subprocess.PIPE,stderr=subprocess.PIPE)
         stdout, stderr = p1.communicate(ascript)
         if p1.returncode == 0:
-            opathl = stdout.decode().split('\n') if sys.version_info.major >= 3 else stdout.split('\n')
+            opathl = stdout.decode().split('\n')
             if len(opathl) >= 1:
                 return opathl[0]+'Contents/MacOS/OpenSCAD'
         #test the default path