Remove version_info test
This commit is contained in:
1 parent
9effab5636
commit
65833f12bd
5 files changed
+7
-22
No files matched your search
@@ -80,12 +80,9 @@ if os.name == 'nt':
|
||||
}
|
||||
args['zipfile'] = 'library.zip'
|
||||
|
||||
if sys.version_info < (2, 6):
|
||||
data_files.append(('', ['msvcp71.dll']))
|
||||
else:
|
||||
data_files.append(('', ['msvcr90.dll', 'msvcp90.dll', 'msvcm90.dll']))
|
||||
manifest = read('Microsoft.VC90.CRT.manifest')
|
||||
args['windows'][0]['other_resources'] = [(24, 1, manifest)]
|
||||
data_files.append(('', ['msvcr90.dll', 'msvcp90.dll', 'msvcm90.dll']))
|
||||
manifest = read('Microsoft.VC90.CRT.manifest')
|
||||
args['windows'][0]['other_resources'] = [(24, 1, manifest)]
|
||||
|
||||
|
||||
elif os.name == 'mac' \
|
||||
|
||||
@@ -371,10 +371,7 @@ def file_open(filename, type, parent, print_p=False):
|
||||
if print_p:
|
||||
operation = 'print'
|
||||
try:
|
||||
if sys.version_info[:2] >= (2, 5):
|
||||
os.startfile(os.path.normpath(filename), operation)
|
||||
else:
|
||||
os.startfile(os.path.normpath(filename))
|
||||
os.startfile(os.path.normpath(filename), operation)
|
||||
except WindowsError:
|
||||
save_name = file_selection(_('Save As...'), parent=parent,
|
||||
action=gtk.FILE_CHOOSER_ACTION_SAVE)
|
||||
|
||||
+1
-4
@@ -9,10 +9,7 @@ from urlparse import urlparse
|
||||
import urllib
|
||||
import gobject
|
||||
import gtk
|
||||
if sys.version_info < (2, 6):
|
||||
import simplejson as json
|
||||
else:
|
||||
import json
|
||||
import json
|
||||
import webbrowser
|
||||
import tryton.rpc as rpc
|
||||
from tryton.config import CONFIG, TRYTON_ICON, PIXMAPS_DIR, DATA_DIR, \
|
||||
|
||||
@@ -3,10 +3,7 @@
|
||||
import gobject
|
||||
import gtk
|
||||
import sys
|
||||
if sys.version_info < (2, 6):
|
||||
import simplejson as json
|
||||
else:
|
||||
import json
|
||||
import json
|
||||
import tryton.rpc as rpc
|
||||
import locale
|
||||
from interface import ParserView
|
||||
|
||||
+1
-4
@@ -1,10 +1,7 @@
|
||||
#This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||
#this repository contains the full copyright notices and license terms.
|
||||
import sys
|
||||
if sys.version_info < (2, 6):
|
||||
import simplejson as json
|
||||
else:
|
||||
import json
|
||||
import json
|
||||
import datetime
|
||||
from functools import reduce
|
||||
|
||||
|
||||
Reference in new issue
Block a user