From 9c349523de74bf815813775ae269d8f3e7ea8d99 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 25 Jan 2016 13:20:29 +0100
Subject: [PATCH] py3: adapt scripts to work with Python3

---
 src/App/PropertyGeo.cpp              | 6 +++---
 src/Mod/Arch/ArchEquipment.py        | 3 ++-
 src/Mod/Arch/ArchProfile.py          | 2 +-
 src/Mod/Arch/ArchStairs.py           | 1 -
 src/Mod/Arch/ArchWindow.py           | 3 ++-
 src/Mod/Arch/importIFC.py            | 4 ++++
 src/Mod/Fem/ccxFrdReader.py          | 4 ++--
 src/Mod/Start/StartPage/StartPage.py | 6 +++---
 8 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp
index 74bbc6646a..4cb855bc6d 100644
--- a/src/App/PropertyGeo.cpp
+++ b/src/App/PropertyGeo.cpp
@@ -265,13 +265,13 @@ PyObject *PropertyVectorList::getPyObject(void)
 
 void PropertyVectorList::setPyObject(PyObject *value)
 {
-    if (PyList_Check(value)) {
-        Py_ssize_t nSize = PyList_Size(value);
+    if (PySequence_Check(value)) {
+        Py_ssize_t nSize = PySequence_Size(value);
         std::vector<Base::Vector3d> values;
         values.resize(nSize);
 
         for (Py_ssize_t i=0; i<nSize;++i) {
-            PyObject* item = PyList_GetItem(value, i);
+            PyObject* item = PySequence_GetItem(value, i);
             PropertyVector val;
             val.setPyObject( item );
             values[i] = val.getValue();
diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py
index 116fb46ab8..3d205effbc 100644
--- a/src/Mod/Arch/ArchEquipment.py
+++ b/src/Mod/Arch/ArchEquipment.py
@@ -27,7 +27,8 @@ __title__="FreeCAD Equipment"
 __author__ = "Yorik van Havre"
 __url__ = "http://www.freecadweb.org"
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands,Units
+import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
+from FreeCAD import Units
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
diff --git a/src/Mod/Arch/ArchProfile.py b/src/Mod/Arch/ArchProfile.py
index 87bd3445e7..d6c3884c14 100644
--- a/src/Mod/Arch/ArchProfile.py
+++ b/src/Mod/Arch/ArchProfile.py
@@ -59,7 +59,7 @@ def readPresets():
     for profilefile in profilefiles:
         if os.path.exists(profilefile):
             try:
-                with open(profilefile, 'rb') as csvfile:
+                with open(profilefile, 'r') as csvfile:
                     beamreader = csv.reader(csvfile)
                     bid=1 #Unique index
                     for row in beamreader:
diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py
index 66ced5cde2..1cd192d3ff 100644
--- a/src/Mod/Arch/ArchStairs.py
+++ b/src/Mod/Arch/ArchStairs.py
@@ -490,7 +490,6 @@ class _Stairs(ArchComponent.Component):
         print("Not yet implemented!")
 
 
-
 class _ViewProviderStairs(ArchComponent.ViewProviderComponent):
     "A View Provider for Stairs"
     def __init__(self,vobj):
diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py
index 5fb2026a72..7296372166 100644
--- a/src/Mod/Arch/ArchWindow.py
+++ b/src/Mod/Arch/ArchWindow.py
@@ -21,7 +21,8 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands,Units
+import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
+from FreeCAD import Units
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py
index 20bd0e87a7..53a007657e 100644
--- a/src/Mod/Arch/importIFC.py
+++ b/src/Mod/Arch/importIFC.py
@@ -354,9 +354,12 @@ def insert(filename,docname,skip=[],only=[],root=None):
     if DEBUG: print("done.")
     
     global ROOT_ELEMENT
+
     if root:
         ROOT_ELEMENT = root
 
+    if DEBUG: print ("done.")
+
     #global ifcfile # keeping global for debugging purposes
     filename = decode(filename,utf=True)
     ifcfile = ifcopenshell.open(filename)
@@ -513,6 +516,7 @@ def insert(filename,docname,skip=[],only=[],root=None):
         except:
             if DEBUG: print(" ERROR unable to get object representation",)
         if prepr and (MERGE_MODE_ARCH == 0) and archobj and CREATE_CLONES:
+
             for s in prepr.Representations:
                 if s.RepresentationIdentifier.upper() == "BODY":
                     if s.Items[0].is_a("IfcMappedItem"):
diff --git a/src/Mod/Fem/ccxFrdReader.py b/src/Mod/Fem/ccxFrdReader.py
index 768d063b8f..c300fc248b 100644
--- a/src/Mod/Fem/ccxFrdReader.py
+++ b/src/Mod/Fem/ccxFrdReader.py
@@ -413,7 +413,7 @@ def importFrd(filename, analysis=None, result_name_prefix=None):
 
         if 'Nodes' in m:
             positions = []
-            for k, v in m['Nodes'].iteritems():
+            for k, v in m['Nodes'].items():
                 positions.append(v)
             p_x_max, p_y_max, p_z_max = map(max, zip(*positions))
             p_x_min, p_y_min, p_z_min = map(min, zip(*positions))
@@ -454,7 +454,7 @@ def importFrd(filename, analysis=None, result_name_prefix=None):
             strainv = result_set['strainv']
             no_of_values = len(disp)
             displacement = []
-            for k, v in disp.iteritems():
+            for k, v in disp.items():
                 displacement.append(v)
 
             x_max, y_max, z_max = map(max, zip(*displacement))
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 08daf2ec80..55206eec62 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -41,10 +41,10 @@ def translate(context,text):
         
     s = cStringIO.StringIO()
     for i in u:
-        if ord(i) == 39:
+        if i == 39:
             s.write("\\'")
         else:
-            s.write(i)
+            s.write(chr(i))
     t = s.getvalue()
     s.close()
     return t
@@ -638,7 +638,7 @@ def setColors(html):
         defaults["#textcolor"] = palette.text().color().name()
         defaults["#windowcolor"] = palette.window().color().name()
         defaults["#windowtextcolor"] = palette.windowText().color().name()
-    for k,v in defaults.iteritems():
+    for k,v in defaults.items():
         html = html.replace(k,str(v))
     return html