Commit 2a40f32c009e16c7d5446284e6de2bfce1f506ee
1 parent
5ccff48a
Add Python version dependent . for relative imports.
Showing
1 changed file
with
18 additions
and
18 deletions
cscripts/__init__.py.in
| @@ -49,26 +49,26 @@ if cur_version > req_version: | @@ -49,26 +49,26 @@ if cur_version > req_version: | ||
| 49 | "csiactobs"]) | 49 | "csiactobs"]) |
| 50 | 50 | ||
| 51 | # Import | 51 | # Import |
| 52 | -from .cscaldb import cscaldb | ||
| 53 | -from .csinfo import csinfo | ||
| 54 | -from .cslightcrv import cslightcrv | ||
| 55 | -from .csmodelinfo import csmodelinfo | ||
| 56 | -from .csmodelmerge import csmodelmerge | ||
| 57 | -from .csobs2caldb import csobs2caldb | ||
| 58 | -from .csobsdef import csobsdef | ||
| 59 | -from .csobsinfo import csobsinfo | ||
| 60 | -from .cspull import cspull | ||
| 61 | -from .csresmap import csresmap | ||
| 62 | -from .cssens import cssens | ||
| 63 | -from .csspec import csspec | ||
| 64 | -from .cstsdist import cstsdist | ||
| 65 | -from .cstsmapmerge import cstsmapmerge | 52 | +from @PYTHON_RELATIVE_IMPORT@cscaldb import cscaldb |
| 53 | +from @PYTHON_RELATIVE_IMPORT@csinfo import csinfo | ||
| 54 | +from @PYTHON_RELATIVE_IMPORT@cslightcrv import cslightcrv | ||
| 55 | +from @PYTHON_RELATIVE_IMPORT@csmodelinfo import csmodelinfo | ||
| 56 | +from @PYTHON_RELATIVE_IMPORT@csmodelmerge import csmodelmerge | ||
| 57 | +from @PYTHON_RELATIVE_IMPORT@csobs2caldb import csobs2caldb | ||
| 58 | +from @PYTHON_RELATIVE_IMPORT@csobsdef import csobsdef | ||
| 59 | +from @PYTHON_RELATIVE_IMPORT@csobsinfo import csobsinfo | ||
| 60 | +from @PYTHON_RELATIVE_IMPORT@cspull import cspull | ||
| 61 | +from @PYTHON_RELATIVE_IMPORT@csresmap import csresmap | ||
| 62 | +from @PYTHON_RELATIVE_IMPORT@cssens import cssens | ||
| 63 | +from @PYTHON_RELATIVE_IMPORT@csspec import csspec | ||
| 64 | +from @PYTHON_RELATIVE_IMPORT@cstsdist import cstsdist | ||
| 65 | +from @PYTHON_RELATIVE_IMPORT@cstsmapmerge import cstsmapmerge | ||
| 66 | from . import obsutils | 66 | from . import obsutils |
| 67 | if cur_version > req_version: | 67 | if cur_version > req_version: |
| 68 | - from .csfindobs import csfindobs | ||
| 69 | - from .csiactcopy import csiactcopy | ||
| 70 | - from .csiactdata import csiactdata | ||
| 71 | - from .csiactobs import csiactobs | 68 | + from @PYTHON_RELATIVE_IMPORT@csfindobs import csfindobs |
| 69 | + from @PYTHON_RELATIVE_IMPORT@csiactcopy import csiactcopy | ||
| 70 | + from @PYTHON_RELATIVE_IMPORT@csiactdata import csiactdata | ||
| 71 | + from @PYTHON_RELATIVE_IMPORT@csiactobs import csiactobs | ||
| 72 | 72 | ||
| 73 | # Delete version check variables | 73 | # Delete version check variables |
| 74 | del sys | 74 | del sys |