Skip to content

Update setupext.py to solve issue #5846 #5849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2016
Merged

Update setupext.py to solve issue #5846 #5849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions setupext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
import versioneer


PY3 = (sys.version_info[0] >= 3)
PY3min = (sys.version_info[0] >= 3)
PY32min = (PY3min and sys.version_info[1] >= 2 or sys.version_info[0] > 3)


# This is the version of FreeType to use when building a local
Expand All @@ -28,13 +29,13 @@
LOCAL_FREETYPE_HASH = '348e667d728c597360e4a87c16556597'

if sys.platform != 'win32':
if sys.version_info[0] < 3:
if not PY3min:
from commands import getstatusoutput
else:
from subprocess import getstatusoutput


if PY3:
if PY3min:
import configparser
else:
import ConfigParser as configparser
Expand All @@ -51,7 +52,10 @@

setup_cfg = os.environ.get('MPLSETUPCFG', 'setup.cfg')
if os.path.exists(setup_cfg):
config = configparser.SafeConfigParser()
if PY32min:
config = configparser.ConfigParser()
else:
config = configparser.SafeConfigParser()
config.read(setup_cfg)

if config.has_option('status', 'suppress'):
Expand Down Expand Up @@ -495,12 +499,17 @@ class OptionalPackage(SetupPackage):
def get_config(cls):
"""
Look at `setup.cfg` and return one of ["auto", True, False] indicating
if the package is at default state ("auto"), forced by the user (True)
or opted-out (False).
if the package is at default state ("auto"), forced by the user (case
insensitively defined as 1, true, yes, on for True) or opted-out (case
insensitively defined as 0, false, no, off for False).
"""
conf = "auto"
if config is not None and config.has_option(cls.config_category, cls.name):
return config.get(cls.config_category, cls.name)
return "auto"
try:
conf = config.getboolean(cls.config_category, cls.name)
except ValueError:
conf = config.get(cls.config_category, cls.name)
return conf

def check(self):
"""
Expand Down Expand Up @@ -1393,7 +1402,7 @@ def __init__(self):

def check_requirements(self):
try:
if PY3:
if PY3min:
import tkinter as Tkinter
else:
import Tkinter
Expand Down Expand Up @@ -1444,7 +1453,7 @@ def query_tcltk(self):
return self.tcl_tk_cache

# By this point, we already know that Tkinter imports correctly
if PY3:
if PY3min:
import tkinter as Tkinter
else:
import Tkinter
Expand Down Expand Up @@ -1485,7 +1494,7 @@ def query_tcltk(self):

def parse_tcl_config(self, tcl_lib_dir, tk_lib_dir):
try:
if PY3:
if PY3min:
import tkinter as Tkinter
else:
import Tkinter
Expand Down