From b1943c8b4ef782bcce56730be71a6a51ea79b2e1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 18 Apr 2021 10:43:34 +0200 Subject: [PATCH] Attempt to mitigate the effects of bpo-36085 in Python 3.8+ on Windows - need to add DLL search paths explicitly. --- testdata/pymod/bridge.py | 2 +- testdata/pymod/import_QtCore.py | 2 +- testdata/pymod/import_QtDesigner.py | 2 +- testdata/pymod/import_QtGui.py | 2 +- testdata/pymod/import_QtMultimedia.py | 2 +- testdata/pymod/import_QtNetwork.py | 2 +- testdata/pymod/import_QtPrintSupport.py | 2 +- testdata/pymod/import_QtSql.py | 2 +- testdata/pymod/import_QtSvg.py | 2 +- testdata/pymod/import_QtUiTools.py | 2 +- testdata/pymod/import_QtWidgets.py | 2 +- testdata/pymod/import_QtXml.py | 2 +- testdata/pymod/import_QtXmlPatterns.py | 2 +- testdata/pymod/import_db.py | 2 +- testdata/pymod/import_lay.py | 2 +- testdata/pymod/import_lay_noqt.py | 2 +- testdata/pymod/import_rdb.py | 2 +- testdata/pymod/import_tl.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/testdata/pymod/bridge.py b/testdata/pymod/bridge.py index 4b3f065ab..5c13a35a0 100755 --- a/testdata/pymod/bridge.py +++ b/testdata/pymod/bridge.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.db as db import bridge_mod as bridge import unittest diff --git a/testdata/pymod/import_QtCore.py b/testdata/pymod/import_QtCore.py index 8780961b5..a51be2317 100755 --- a/testdata/pymod/import_QtCore.py +++ b/testdata/pymod/import_QtCore.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import unittest import sys diff --git a/testdata/pymod/import_QtDesigner.py b/testdata/pymod/import_QtDesigner.py index 885653147..484fa235c 100755 --- a/testdata/pymod/import_QtDesigner.py +++ b/testdata/pymod/import_QtDesigner.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtDesigner as QtDesigner import unittest diff --git a/testdata/pymod/import_QtGui.py b/testdata/pymod/import_QtGui.py index b66a906e8..a9a74866c 100755 --- a/testdata/pymod/import_QtGui.py +++ b/testdata/pymod/import_QtGui.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore import klayout.QtGui as QtGui import unittest diff --git a/testdata/pymod/import_QtMultimedia.py b/testdata/pymod/import_QtMultimedia.py index 477590879..66a0a21bb 100755 --- a/testdata/pymod/import_QtMultimedia.py +++ b/testdata/pymod/import_QtMultimedia.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtGui as QtGui import klayout.QtWidgets as QtWidgets diff --git a/testdata/pymod/import_QtNetwork.py b/testdata/pymod/import_QtNetwork.py index 684adf4c2..0e916b8b0 100755 --- a/testdata/pymod/import_QtNetwork.py +++ b/testdata/pymod/import_QtNetwork.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtNetwork as QtNetwork import unittest diff --git a/testdata/pymod/import_QtPrintSupport.py b/testdata/pymod/import_QtPrintSupport.py index b7f9099d5..e0b99e4f3 100755 --- a/testdata/pymod/import_QtPrintSupport.py +++ b/testdata/pymod/import_QtPrintSupport.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtGui as QtGui import klayout.QtWidgets as QtWidgets diff --git a/testdata/pymod/import_QtSql.py b/testdata/pymod/import_QtSql.py index 18cf8ab92..f4b9c4bf7 100755 --- a/testdata/pymod/import_QtSql.py +++ b/testdata/pymod/import_QtSql.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtSql as QtSql import unittest diff --git a/testdata/pymod/import_QtSvg.py b/testdata/pymod/import_QtSvg.py index 23763d80f..c61bff31b 100755 --- a/testdata/pymod/import_QtSvg.py +++ b/testdata/pymod/import_QtSvg.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtGui as QtGui import klayout.QtWidgets as QtWidgets diff --git a/testdata/pymod/import_QtUiTools.py b/testdata/pymod/import_QtUiTools.py index 811e12200..e600d9c70 100755 --- a/testdata/pymod/import_QtUiTools.py +++ b/testdata/pymod/import_QtUiTools.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtUiTools as QtUiTools import unittest diff --git a/testdata/pymod/import_QtWidgets.py b/testdata/pymod/import_QtWidgets.py index 687bd0565..c0578c8ea 100755 --- a/testdata/pymod/import_QtWidgets.py +++ b/testdata/pymod/import_QtWidgets.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtGui as QtGui import klayout.QtWidgets as QtWidgets diff --git a/testdata/pymod/import_QtXml.py b/testdata/pymod/import_QtXml.py index 470ef7f41..81f5ed257 100755 --- a/testdata/pymod/import_QtXml.py +++ b/testdata/pymod/import_QtXml.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtXml as QtXml import unittest diff --git a/testdata/pymod/import_QtXmlPatterns.py b/testdata/pymod/import_QtXmlPatterns.py index bbec7b466..c6538ca34 100755 --- a/testdata/pymod/import_QtXmlPatterns.py +++ b/testdata/pymod/import_QtXmlPatterns.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore as QtCore import klayout.QtXmlPatterns as QtXmlPatterns import unittest diff --git a/testdata/pymod/import_db.py b/testdata/pymod/import_db.py index 9d5265747..f4493e20a 100755 --- a/testdata/pymod/import_db.py +++ b/testdata/pymod/import_db.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.db as db import unittest import sys diff --git a/testdata/pymod/import_lay.py b/testdata/pymod/import_lay.py index c3ed232e6..928255447 100755 --- a/testdata/pymod/import_lay.py +++ b/testdata/pymod/import_lay.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.QtCore import klayout.QtGui if not "QApplication" in klayout.QtGui.__all__: diff --git a/testdata/pymod/import_lay_noqt.py b/testdata/pymod/import_lay_noqt.py index add48ecd2..36d9c0e8f 100755 --- a/testdata/pymod/import_lay_noqt.py +++ b/testdata/pymod/import_lay_noqt.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.db as db import klayout.lay as lay import unittest diff --git a/testdata/pymod/import_rdb.py b/testdata/pymod/import_rdb.py index fef843c97..e0b7d9889 100755 --- a/testdata/pymod/import_rdb.py +++ b/testdata/pymod/import_rdb.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.rdb as rdb import unittest import sys diff --git a/testdata/pymod/import_tl.py b/testdata/pymod/import_tl.py index 4662b7428..da0c070cf 100755 --- a/testdata/pymod/import_tl.py +++ b/testdata/pymod/import_tl.py @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +import testprep import klayout.tl as tl import unittest import sys