From 003d486e140d7c8ee1dfe73fa1f7fff5702905b0 Mon Sep 17 00:00:00 2001 From: James Krieger Date: Wed, 17 Feb 2021 14:25:59 +0000 Subject: [PATCH] tightened imports --- prody/hybrid/adaptive.py | 8 ++++---- prody/hybrid/clustenm.py | 8 +++----- prody/hybrid/hybrid.py | 14 +++++--------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/prody/hybrid/adaptive.py b/prody/hybrid/adaptive.py index 21fc386eb..da267d040 100644 --- a/prody/hybrid/adaptive.py +++ b/prody/hybrid/adaptive.py @@ -20,11 +20,11 @@ from prody import LOGGER from prody.atomic import Atomic, AtomMap -from prody.utilities import getCoords, createStringIO, importLA, mad +from prody.utilities import getCoords, createStringIO, importLA -from prody.measure import calcRMSD, calcDistance, superpose, applyTransformation -from prody.proteins import writePDB, parsePDB, writePDBStream, parsePDBStream -from prody.ensemble import Ensemble +from prody.measure.transform import calcTransformation, applyTransformation, calcRMSD +from prody.ensemble.ensemble import Ensemble +from prody.proteins.pdbfile import writePDBStream, parsePDBStream from prody.dynamics.functions import calcENM from prody.dynamics.modeset import ModeSet diff --git a/prody/hybrid/clustenm.py b/prody/hybrid/clustenm.py index 4b4ba3f3b..1d0d54074 100644 --- a/prody/hybrid/clustenm.py +++ b/prody/hybrid/clustenm.py @@ -43,11 +43,9 @@ from prody.dynamics.exanm import exANM from prody.dynamics.editing import extendModel from prody.dynamics.sampling import sampleModes -from prody.atomic import AtomGroup -from prody.measure import calcTransformation, applyTransformation, calcRMSD -from prody.ensemble import Ensemble -from prody.proteins import writePDB, parsePDB, writePDBStream, parsePDBStream -from prody.utilities import createStringIO, importLA, mad + +from prody.measure.transform import calcTransformation, applyTransformation, calcRMSD +from prody.proteins.pdbfile import writePDB, writePDBStream, parsePDBStream from .hybrid import Hybrid diff --git a/prody/hybrid/hybrid.py b/prody/hybrid/hybrid.py index b3244dd05..2809e6d51 100644 --- a/prody/hybrid/hybrid.py +++ b/prody/hybrid/hybrid.py @@ -39,17 +39,13 @@ from prody.dynamics.anm import ANM from prody.dynamics.gnm import GNM, ZERO -from prody.dynamics.rtb import RTB -from prody.dynamics.imanm import imANM -from prody.dynamics.exanm import exANM from prody.dynamics.editing import extendModel -from prody.dynamics.sampling import sampleModes -from prody.atomic import AtomGroup, Atomic -from prody.measure import calcTransformation, applyTransformation, calcRMSD -from prody.ensemble import Ensemble -from prody.proteins import writePDB, writePDBStream, parsePDBStream, EMDMAP -from prody.utilities import createStringIO, importLA, mad, getCoords +from prody.measure.transform import calcTransformation, applyTransformation, calcRMSD +from prody.ensemble.ensemble import Ensemble +from prody.proteins.pdbfile import writePDB, writePDBStream, parsePDBStream + +from prody.utilities import createStringIO, importLA, mad la = importLA() norm = la.norm