jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minimum Python version check correction

Browse source 
Fixes Recent breakage when using -builtin and %import
This commit is contained in:
William S Fulton 2018-11-25 21:53:57 +00:00
commit e729a868b9
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Modules/python.cxx
View file

@ -731,7 +731,7 @@ public:
* globals()[attr] = getattr(_foo, attr) * globals()[attr] = getattr(_foo, attr)
* *
*/ */
Printf(default_import_code, "# pull in all the attributes from %s\n", module); Printf(default_import_code, "\n# Pull in all the attributes from %s\n", module);
Printv(default_import_code, "if __name__.rpartition('.')[0] != '':\n", NULL); Printv(default_import_code, "if __name__.rpartition('.')[0] != '':\n", NULL);
Printv(default_import_code, tab4, "if _swig_python_version_info >= (2, 7, 0):\n", NULL); Printv(default_import_code, tab4, "if _swig_python_version_info >= (2, 7, 0):\n", NULL);
Printv(default_import_code, tab8, "try:\n", NULL); Printv(default_import_code, tab8, "try:\n", NULL);
@ -900,13 +900,14 @@ public:
Swig_banner_target_lang(f_shadow_py, "#"); Swig_banner_target_lang(f_shadow_py, "#");
if (Len(f_shadow_begin) > 0) if (Len(f_shadow_begin) > 0)
Printv(f_shadow_py, "\n", f_shadow_begin, "\n", NIL); Printv(f_shadow_py, "\n", f_shadow_begin, "\n", NIL);
if (Len(f_shadow_after_begin) > 0)
Printv(f_shadow_py, f_shadow_after_begin, "\n", NIL);
Printv(f_shadow_py, "\nfrom sys import version_info as _swig_python_version_info\n", NULL); Printv(f_shadow_py, "\nfrom sys import version_info as _swig_python_version_info\n", NULL);
Printv(f_shadow_py, "if _swig_python_version_info < (2, 7, 0):\n", NULL); Printv(f_shadow_py, "if _swig_python_version_info < (2, 7, 0):\n", NULL);
Printv(f_shadow_py, tab4, "raise RuntimeError('Python 2.7 or later required')\n\n", NULL); Printv(f_shadow_py, tab4, "raise RuntimeError('Python 2.7 or later required')\n\n", NULL);
if (Len(f_shadow_after_begin) > 0)
Printv(f_shadow_py, f_shadow_after_begin, "\n", NIL);
if (moduleimport) { if (moduleimport) {
Replaceall(moduleimport, "$module", module); Replaceall(moduleimport, "$module", module);
Printv(f_shadow_py, moduleimport, "\n", NIL); Printv(f_shadow_py, moduleimport, "\n", NIL);