From b4a37afc3a246458eab01e21931fc5149a4ec748 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Fri, 15 Nov 2019 09:13:26 +0100
Subject: [PATCH] Fixed implicit relative import for Python modules in shared
object files
That's the Python modules we generate with boost.python. 2to3 misses them
---
modules/base/pymod/__init__.py.in | 4 ++--
modules/bindings/pymod/__init__.py | 2 +-
modules/conop/pymod/__init__.py | 2 +-
modules/db/pymod/__init__.py | 2 +-
modules/geom/pymod/__init__.py | 2 +-
modules/gfx/pymod/__init__.py | 2 +-
modules/gfx/pymod/py_gfx_obj.py | 2 +-
modules/gui/pymod/__init__.py | 2 +-
modules/img/alg/pymod/__init__.py | 2 +-
modules/img/base/pymod/__init__.py | 2 +-
modules/info/pymod/__init__.py | 2 +-
modules/io/pymod/__init__.py | 2 +-
modules/mol/alg/pymod/__init__.py | 2 +-
modules/mol/base/pymod/__init__.py | 2 +-
modules/mol/mm/pymod/__init__.py | 2 +-
modules/seq/alg/pymod/__init__.py | 2 +-
modules/seq/base/pymod/__init__.py | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/modules/base/pymod/__init__.py.in b/modules/base/pymod/__init__.py.in
index 89316b831..2676aa771 100644
--- a/modules/base/pymod/__init__.py.in
+++ b/modules/base/pymod/__init__.py.in
@@ -20,8 +20,8 @@
__all__=['CharList','Correl', 'FileLogSink', 'FloatList', 'FloatMatrix', 'FloatMatrix3', 'FloatMatrix4', 'GetCurrentLogSink', 'GetPrefixPath', 'GetSharedDataPath', 'GetVerbosityLevel', 'Histogram', 'IntList', 'LogDebug', 'LogError', 'LogInfo', 'LogScript', 'LogSink', 'LogTrace', 'LogVerbose', 'LogWarning', 'Max', 'Mean', 'Median', 'Min', 'MultiLogSink', 'PopLogSink', 'PopVerbosityLevel', 'PushLogSink', 'PushVerbosityLevel', 'Range', 'SetPrefixPath', 'StdDev', 'StreamLogSink', 'StringList', 'StringLogSink', 'Units', 'VERSION', 'VERSION_MAJOR', 'VERSION_MINOR', 'VERSION_PATCH', 'WITH_NUMPY', 'conop', 'geom', 'io', 'mol', 'seq', 'stutil' @ALL_ADDITIONAL_MODULES@]
-from _ost_base import *
-from stutil import *
+from ._ost_base import *
+from .stutil import *
class StreamLogSink(LogSink):
def __init__(self, stream):
diff --git a/modules/bindings/pymod/__init__.py b/modules/bindings/pymod/__init__.py
index 4510f10ef..c61b4e974 100644
--- a/modules/bindings/pymod/__init__.py
+++ b/modules/bindings/pymod/__init__.py
@@ -8,4 +8,4 @@ from ost.bindings import hbplus
from ost.bindings import clustalw
from ost.bindings import cadscore
from ost.bindings import align_3dcomb
-from _ost_bindings import *
+from ._ost_bindings import *
diff --git a/modules/conop/pymod/__init__.py b/modules/conop/pymod/__init__.py
index 3b7856fe1..b70493ec9 100644
--- a/modules/conop/pymod/__init__.py
+++ b/modules/conop/pymod/__init__.py
@@ -16,7 +16,7 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_conop import *
+from ._ost_conop import *
# The 20 standard amino acids in no particular order
STANDARD_AMINOACIDS=(
diff --git a/modules/db/pymod/__init__.py b/modules/db/pymod/__init__.py
index d443def87..38881c6df 100644
--- a/modules/db/pymod/__init__.py
+++ b/modules/db/pymod/__init__.py
@@ -16,4 +16,4 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_db import *
+from ._ost_db import *
diff --git a/modules/geom/pymod/__init__.py b/modules/geom/pymod/__init__.py
index bd4691781..88ad89786 100644
--- a/modules/geom/pymod/__init__.py
+++ b/modules/geom/pymod/__init__.py
@@ -16,4 +16,4 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_geom import *
+from ._ost_geom import *
diff --git a/modules/gfx/pymod/__init__.py b/modules/gfx/pymod/__init__.py
index a0525f126..60ad84ec6 100644
--- a/modules/gfx/pymod/__init__.py
+++ b/modules/gfx/pymod/__init__.py
@@ -16,7 +16,7 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_gfx import *
+from ._ost_gfx import *
from .py_gfx_obj import PyGfxObj
WHITE=RGB(1.0,1.0,1.0)
diff --git a/modules/gfx/pymod/py_gfx_obj.py b/modules/gfx/pymod/py_gfx_obj.py
index ac91e9073..557e645ec 100644
--- a/modules/gfx/pymod/py_gfx_obj.py
+++ b/modules/gfx/pymod/py_gfx_obj.py
@@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
import traceback
-from _ost_gfx import *
+from ._ost_gfx import *
class PyGfxObj(GfxObj):
def __init__(self,name):
diff --git a/modules/gui/pymod/__init__.py b/modules/gui/pymod/__init__.py
index 4343829dc..68b4a7300 100644
--- a/modules/gui/pymod/__init__.py
+++ b/modules/gui/pymod/__init__.py
@@ -17,7 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
import ost.gui.trajectory_viewer
-from _ost_gui import *
+from ._ost_gui import *
import sip
diff --git a/modules/img/alg/pymod/__init__.py b/modules/img/alg/pymod/__init__.py
index d67a86754..805731f76 100644
--- a/modules/img/alg/pymod/__init__.py
+++ b/modules/img/alg/pymod/__init__.py
@@ -16,4 +16,4 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_img_alg import *
+from ._ost_img_alg import *
diff --git a/modules/img/base/pymod/__init__.py b/modules/img/base/pymod/__init__.py
index 82a290219..398809616 100644
--- a/modules/img/base/pymod/__init__.py
+++ b/modules/img/base/pymod/__init__.py
@@ -16,6 +16,6 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_img import *
+from ._ost_img import *
MapHandle=ImageHandle
from ost.img import alg
diff --git a/modules/info/pymod/__init__.py b/modules/info/pymod/__init__.py
index 4243e15ac..5d78be195 100644
--- a/modules/info/pymod/__init__.py
+++ b/modules/info/pymod/__init__.py
@@ -16,7 +16,7 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_info import *
+from ._ost_info import *
def LoadOrCreateInfo(name):
import os.path
diff --git a/modules/io/pymod/__init__.py b/modules/io/pymod/__init__.py
index eee7af12d..85e1a325e 100644
--- a/modules/io/pymod/__init__.py
+++ b/modules/io/pymod/__init__.py
@@ -18,7 +18,7 @@
#------------------------------------------------------------------------------
import os, tempfile, ftplib, http.client
-from _ost_io import *
+from ._ost_io import *
from ost import mol, geom, conop, seq
profiles=None
diff --git a/modules/mol/alg/pymod/__init__.py b/modules/mol/alg/pymod/__init__.py
index 73d5bd802..16127a166 100644
--- a/modules/mol/alg/pymod/__init__.py
+++ b/modules/mol/alg/pymod/__init__.py
@@ -1,5 +1,5 @@
import os.path
-from _ost_mol_alg import *
+from ._ost_mol_alg import *
from ost.mol.alg.superpose import *
import ost.mol.alg.trajectory_analysis
import ost.mol.alg.structure_analysis
diff --git a/modules/mol/base/pymod/__init__.py b/modules/mol/base/pymod/__init__.py
index 512e4daf0..e6dd8d59a 100644
--- a/modules/mol/base/pymod/__init__.py
+++ b/modules/mol/base/pymod/__init__.py
@@ -16,7 +16,7 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_mol import *
+from ._ost_mol import *
import ost.geom as _geom
from ost.mol import alg
diff --git a/modules/mol/mm/pymod/__init__.py b/modules/mol/mm/pymod/__init__.py
index f10fd7e6b..ac671a2b6 100644
--- a/modules/mol/mm/pymod/__init__.py
+++ b/modules/mol/mm/pymod/__init__.py
@@ -18,7 +18,7 @@
#------------------------------------------------------------------------------
import os.path
-from _ost_mol_mm import *
+from ._ost_mol_mm import *
from . import antechamber
import ost
diff --git a/modules/seq/alg/pymod/__init__.py b/modules/seq/alg/pymod/__init__.py
index 8d9b9c806..9ce2fff11 100644
--- a/modules/seq/alg/pymod/__init__.py
+++ b/modules/seq/alg/pymod/__init__.py
@@ -1,4 +1,4 @@
-from _ost_seq_alg import *
+from ._ost_seq_alg import *
from ost.seq.alg.mat import *
def ValidateSEQRESAlignment(aln, chain=None):
diff --git a/modules/seq/base/pymod/__init__.py b/modules/seq/base/pymod/__init__.py
index 1594a2553..2e45c5a10 100644
--- a/modules/seq/base/pymod/__init__.py
+++ b/modules/seq/base/pymod/__init__.py
@@ -16,7 +16,7 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#------------------------------------------------------------------------------
-from _ost_seq import *
+from ._ost_seq import *
from ost.seq import alg
_CreateAlignment=CreateAlignment
--
GitLab