Skip to content

Commit db54c39

Browse files
committed
replace checking of configuration of optional backends in overridden check() methods by a super() call
1 parent fc759ee commit db54c39

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

setupext.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,8 +1017,7 @@ def __init__(self):
10171017
self.tcl_tk_cache = None
10181018

10191019
def check(self):
1020-
if self.get_config() is False:
1021-
raise CheckFailed("skipping due to configuration")
1020+
super(BackendTkAgg, self).check()
10221021

10231022
try:
10241023
if sys.version_info[0] < 3:
@@ -1306,8 +1305,7 @@ class BackendGtk(OptionalBackendPackage):
13061305
name = "gtk"
13071306

13081307
def check(self):
1309-
if self.get_config() is False:
1310-
raise CheckFailed("skipping due to configuration")
1308+
super(BackendGtk, self).check()
13111309

13121310
try:
13131311
import gtk
@@ -1462,8 +1460,7 @@ class BackendGtk3Agg(OptionalBackendPackage):
14621460
name = "gtk3agg"
14631461

14641462
def check(self):
1465-
if self.get_config() is False:
1466-
raise CheckFailed("skipping due to configuration")
1463+
super(BackendGtk3Agg, self).check()
14671464

14681465
if 'TRAVIS' in os.environ:
14691466
raise CheckFailed("Can't build with Travis")
@@ -1528,8 +1525,7 @@ class BackendGtk3Cairo(OptionalBackendPackage):
15281525
name = "gtk3cairo"
15291526

15301527
def check(self):
1531-
if self.get_config() is False:
1532-
raise CheckFailed("skipping due to configuration")
1528+
super(BackendGtk3Cairo, self).check()
15331529

15341530
if 'TRAVIS' in os.environ:
15351531
raise CheckFailed("Can't build with Travis")
@@ -1559,8 +1555,7 @@ class BackendWxAgg(OptionalBackendPackage):
15591555
name = "wxagg"
15601556

15611557
def check(self):
1562-
if self.get_config() is False:
1563-
raise CheckFailed("skipping due to configuration")
1558+
super(BackendWxAgg, self).check()
15641559

15651560
try:
15661561
import wxversion
@@ -1600,8 +1595,7 @@ class BackendMacOSX(OptionalBackendPackage):
16001595
name = 'macosx'
16011596

16021597
def check(self):
1603-
if self.get_config() is False:
1604-
raise CheckFailed("skipping due to configuration")
1598+
super(BackendMacOSX, self).check()
16051599

16061600
if sys.platform != 'darwin':
16071601
raise CheckFailed("Mac OS-X only")
@@ -1630,8 +1624,7 @@ class Windowing(OptionalBackendPackage):
16301624
name = "windowing"
16311625

16321626
def check(self):
1633-
if self.get_config() is False:
1634-
raise CheckFailed("skipping due to configuration")
1627+
super(Windowing, self).check()
16351628

16361629
if sys.platform != 'win32':
16371630
raise CheckFailed("Microsoft Windows only")
@@ -1664,8 +1657,7 @@ def convert_qt_version(self, version):
16641657
return '.'.join(temp)
16651658

16661659
def check(self):
1667-
if self.get_config() is False:
1668-
raise CheckFailed("skipping due to configuration")
1660+
super(BackendQt4, self).check()
16691661

16701662
try:
16711663
from PyQt4 import pyqtconfig
@@ -1685,8 +1677,7 @@ class BackendPySide(OptionalBackendPackage):
16851677
name = "pyside"
16861678

16871679
def check(self):
1688-
if self.get_config() is False:
1689-
raise CheckFailed("skipping due to configuration")
1680+
super(BackendPySide, self).check()
16901681

16911682
try:
16921683
from PySide import __version__
@@ -1704,8 +1695,7 @@ class BackendCairo(OptionalBackendPackage):
17041695
name = "cairo"
17051696

17061697
def check(self):
1707-
if self.get_config() is False:
1708-
raise CheckFailed("skipping due to configuration")
1698+
super(BackendCairo, self).check()
17091699

17101700
try:
17111701
import cairo

0 commit comments

Comments
 (0)