Fix version detection for all Python versions

Inspecting sys.version_info using named component attributes was added in
the patch "Some fixes to start support for python3."

Named component attributes were only added to sys.version_info in Python
2.7 so their use breaks Cura for Python 2.6.

As Cura otherwise works in the still widely used Python 2.6 it seems best
to maintain this compatibility.

diff --git a/Cura/cura_sf/fabmetheus_utilities/euclidean.py b/Cura/cura_sf/fabmetheus_utilities/euclidean.py
index 898666c10f2b9d950843fa929f6601c7f9ed8d75..a8efd49bd3359b161355682e9e2c5d3bf15ec891 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/euclidean.py
+++ b/Cura/cura_sf/fabmetheus_utilities/euclidean.py
@@ -37,7 +37,7 @@ import sys
 import math
 import random
 
-if sys.version_info.major < 3:
+if sys.version_info[0] < 3:
        import cStringIO
 else:
        import io as cStringIO

diff --git a/Cura/cura_sf/fabmetheus_utilities/gcodec.py b/Cura/cura_sf/fabmetheus_utilities/gcodec.py
index 1a6ac77b56aa435e0c10014e3e41a3c8190f791c..04843c620e06189d24f118ed661a1036d87218da 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/gcodec.py
+++ b/Cura/cura_sf/fabmetheus_utilities/gcodec.py
@@ -29,7 +29,7 @@ import os
 import sys
 import traceback
 
-if sys.version_info.major < 3:
+if sys.version_info[0] < 3:
        import cStringIO
 else:
        import io as cStringIO

diff --git a/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py b/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py
index 460ffca09340212e93951c1f4d203cce78515ed2..57f4df28ed448543fb042f5c5033e03ca8cea529 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py
+++ b/Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py
@@ -10,7 +10,7 @@ import __init__
 
 import sys
 
-if sys.version_info.major < 3:
+if sys.version_info[0] < 3:
        import cStringIO
 else:
        import io as cStringIO

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index ae5cdd66959e9397a39a57dfd90d69e60200b1f3..b8fc6c5e9b04168289184ac1675c6c3d6f40d2d5 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -4,7 +4,7 @@ from __future__ import division
 import __init__\r
 \r
 import os, traceback, math, re, zlib, base64, time, sys\r
-if sys.version_info.major < 3:\r
+if sys.version_info[0] < 3:\r
        import ConfigParser\r
 else:\r
        import configparser as ConfigParser\r