[Cython] Fix Python 2.6 compatibility issues with sys.version_info
The "major" attribute is a new feature in Python 2.7.
This commit is contained in:
parent
c846d8237e
commit
ab7775e67e
24 changed files with 25 additions and 25 deletions
|
|
@ -16,7 +16,7 @@ import sys, os
|
|||
# If extensions (or modules to document with autodoc) are in another directory,
|
||||
# add these directories to sys.path here. If the directory is relative to the
|
||||
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
sys.path.insert(0, os.path.abspath('../../build/python3'))
|
||||
else:
|
||||
sys.path.insert(0, os.path.abspath('../../build/python2'))
|
||||
|
|
@ -90,7 +90,7 @@ release = '2.1a1'
|
|||
# List of patterns, relative to source directory, that match files and
|
||||
# directories to ignore when looking for source files.
|
||||
exclude_patterns = []
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
exclude_patterns.append('python/*')
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ from __future__ import print_function
|
|||
from types import *
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
from tkinter.scrolledtext import ScrolledText
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import os, math, string, sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
from tkinter.filedialog import askopenfilename
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from __future__ import print_function
|
||||
import sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import os, math,sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
from tkinter.filedialog import askopenfilename
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from __future__ import print_function
|
|||
|
||||
import os, math, sys
|
||||
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from cantera import *
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from cantera import *
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
from cantera import *
|
||||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# functionality imports
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ _app_version = '1.0'
|
|||
|
||||
# functionality imports
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
from tkinter import messagebox
|
||||
from tkinter.filedialog import askopenfilename
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
else:
|
||||
from Tkinter import *
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
import sys
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import *
|
||||
from tkinter.filedialog import askopenfilename
|
||||
from tkinter import messagebox
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import os, sys
|
|||
import types, traceback
|
||||
|
||||
try:
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
from tkinter import Tk
|
||||
from tkinter import messagebox
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import sys
|
|||
import os
|
||||
|
||||
cantera_root = os.getcwd().split(os.sep)[:-2]
|
||||
if sys.version_info.major == 3:
|
||||
if sys.version_info[0] == 3:
|
||||
sys.path.insert(0, os.sep.join(cantera_root + ['build', 'python3']))
|
||||
else:
|
||||
sys.path.insert(0, os.sep.join(cantera_root + ['build', 'python2']))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue