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

Python minimum version checking fixes

Browse source 
When  using the moduleimport option, such as:

  %module(moduleimport="import $module") example

the minimum Python version check disappeared from the generated Python
file. The code has been refactored and _swig_python_version_info is
no longer deleted after initial use as it can be used in a few places,
in particular, when -builtin is used.
This commit is contained in:
William S Fulton 2018-11-23 18:08:33 +00:00
commit 0f61c5a847
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Source/Modules/python.cxx
View file

@ -693,10 +693,6 @@ public:
mod_docstring = NULL; mod_docstring = NULL;
} }
Printv(default_import_code, "\nfrom sys import version_info as _swig_python_version_info\n", NULL);
Printv(default_import_code, "if _swig_python_version_info < (2, 7, 0):\n", NULL);
Printv(default_import_code, tab4, "raise RuntimeError('Python 2.7 or later required')\n", NULL);
/* Import the C-extension module. This should be a relative import, /* Import the C-extension module. This should be a relative import,
* since the shadow module may also have been imported by a relative * since the shadow module may also have been imported by a relative
* import, and there is thus no guarantee that the C-extension is on * import, and there is thus no guarantee that the C-extension is on
@ -748,10 +744,6 @@ public:
Printf(default_import_code, tab4 "from %s import *\n", module); Printf(default_import_code, tab4 "from %s import *\n", module);
} }
/* Delete the _swig_python_version_info symbol since we don't use it elsewhere in the
* module. */
Printv(default_import_code, "del _swig_python_version_info\n\n", NULL);
/* Need builtins to qualify names like Exception that might also be /* Need builtins to qualify names like Exception that might also be
defined in this module (try both Python 3 and Python 2 names) */ defined in this module (try both Python 3 and Python 2 names) */
Printv(f_shadow, "try:\n", tab4, "import builtins as __builtin__\n", "except ImportError:\n", tab4, "import __builtin__\n", NULL); Printv(f_shadow, "try:\n", tab4, "import builtins as __builtin__\n", "except ImportError:\n", tab4, "import __builtin__\n", NULL);
@ -910,13 +902,19 @@ public:
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) if (Len(f_shadow_after_begin) > 0)
Printv(f_shadow_py, f_shadow_after_begin, "\n", NIL); 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, "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);
if (moduleimport) { if (moduleimport) {
Replaceall(moduleimport, "$module", module); Replaceall(moduleimport, "$module", module);
Printv(f_shadow_py, "\n", moduleimport, "\n", NIL); Printv(f_shadow_py, moduleimport, "\n", NIL);
} else { } else {
Printv(f_shadow_py, default_import_code, NIL); Printv(f_shadow_py, default_import_code, NIL);
} }
Printv(f_shadow_py, f_shadow, "\n", NIL);
Printv(f_shadow_py, "\n", f_shadow, "\n", NIL);
Printv(f_shadow_py, f_shadow_stubs, "\n", NIL); Printv(f_shadow_py, f_shadow_stubs, "\n", NIL);
Delete(f_shadow_py); Delete(f_shadow_py);
} }
@ -1123,14 +1121,12 @@ public:
Printf(out, "import %s%s%s%s\n", apkg, *Char(apkg) ? "." : "", pfx, mod); Printf(out, "import %s%s%s%s\n", apkg, *Char(apkg) ? "." : "", pfx, mod);
Delete(apkg); Delete(apkg);
} else { } else {
Printf(out, "from sys import version_info as _swig_python_version_info\n");
Printf(out, "if _swig_python_version_info >= (2, 7, 0):\n"); Printf(out, "if _swig_python_version_info >= (2, 7, 0):\n");
if (py3_rlen1) if (py3_rlen1)
Printf(out, tab4 "from . import %.*s\n", py3_rlen1, rpkg); Printf(out, tab4 "from . import %.*s\n", py3_rlen1, rpkg);
Printf(out, tab4 "from .%s import %s%s\n", rpkg, pfx, mod); Printf(out, tab4 "from .%s import %s%s\n", rpkg, pfx, mod);
Printf(out, "else:\n"); Printf(out, "else:\n");
Printf(out, tab4 "import %s%s%s%s\n", rpkg, *Char(rpkg) ? "." : "", pfx, mod); Printf(out, tab4 "import %s%s%s%s\n", rpkg, *Char(rpkg) ? "." : "", pfx, mod);
Printf(out, "del _swig_python_version_info\n");
Delete(rpkg); Delete(rpkg);
} }
return out; return out;