diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-28 20:24:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 20:24:34 +0200 |
| commit | 07129deaeb767528e550344e1134f2739c89bdd0 (patch) | |
| tree | 37210f9fd080a28dff7df83a2f787b9671157325 | |
| parent | 90298ddf01622ec4d8a50deaf7c351a766b9e78a (diff) | |
| parent | 8fd337e2df27cec7dafa8bda5fcc03dfe6930a51 (diff) | |
Merge pull request #20544 from dragmz/fix-py37-windows-build
fix windows build using python 3.7
| -rw-r--r-- | core/make_binders.py | 3 | ||||
| -rw-r--r-- | methods.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/make_binders.py b/core/make_binders.py index f1a10829a3..4c61b90d99 100644 --- a/core/make_binders.py +++ b/core/make_binders.py @@ -1,6 +1,4 @@ # -*- coding: ibm850 -*- -from platform_methods import subprocess_main - template_typed = """ #ifdef TYPED_METHOD_BIND @@ -274,4 +272,5 @@ def run(target, source, env): if __name__ == '__main__': + from platform_methods import subprocess_main subprocess_main(globals()) diff --git a/methods.py b/methods.py index d72cd4afe9..e9450d95e2 100644 --- a/methods.py +++ b/methods.py @@ -6,12 +6,12 @@ import glob import string import datetime import subprocess -from compat import iteritems +from compat import iteritems, isbasestring def add_source_files(self, sources, filetype, lib_env=None, shared=False): - if isinstance(filetype, basestring): + if isbasestring(filetype): dir_path = self.Dir('.').abspath filetype = glob.glob(dir_path + "/" + filetype) |