Skip to content
Snippets Groups Projects
Commit b4a37afc authored by Studer Gabriel's avatar Studer Gabriel
Browse files

Fixed implicit relative import for Python modules in shared object files

That's the Python modules we generate with boost.python. 2to3 misses them
parent 70c2e161
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 18 deletions
......@@ -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):
......
......@@ -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 *
......@@ -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=(
......
......@@ -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 *
......@@ -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 *
......@@ -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)
......
......@@ -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):
......
......@@ -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
......
......@@ -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 *
......@@ -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
......@@ -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
......
......@@ -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
......
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
......
......@@ -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
......
......@@ -18,7 +18,7 @@
#------------------------------------------------------------------------------
import os.path
from _ost_mol_mm import *
from ._ost_mol_mm import *
from . import antechamber
import ost
......
from _ost_seq_alg import *
from ._ost_seq_alg import *
from ost.seq.alg.mat import *
def ValidateSEQRESAlignment(aln, chain=None):
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment