From acdf5eb5c34e603f4a8afb5d13ec264dc2228fe4 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Fri, 8 Aug 2014 17:59:35 +0200
Subject: [PATCH] More pithonic module loading
---
meld/tests/test_raw_modeling.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meld/tests/test_raw_modeling.py b/meld/tests/test_raw_modeling.py
index cccb6456..88d1d6f6 100644
--- a/meld/tests/test_raw_modeling.py
+++ b/meld/tests/test_raw_modeling.py
@@ -1,6 +1,6 @@
import unittest
from promod3 import *
-from promod3.meld import *
+from promod3 import meld
from ost import conop, seq, io, mol
class RawModelingTests(unittest.TestCase):
@@ -13,14 +13,14 @@ class RawModelingTests(unittest.TestCase):
# test that BuildRawModel throws exception when no view is attached
aln=seq.CreateAlignment(seq.CreateSequence('A', 'acdef'),
seq.CreateSequence('B', 'ac-ef'))
- self.assertRaises(RuntimeError, BuildRawModel, aln)
+ self.assertRaises(RuntimeError, meld.BuildRawModel, aln)
def testModeledSequence(self):
# test if the model has the sequence we want.
tpl=io.LoadPDB('data/raw-modeling/gly.pdb')
aln=io.LoadAlignment('data/raw-modeling/seq.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
seq1=seq.SequenceFromChain('MODEL', result.model.chains[0])
self.assertEqual(seq1.string, aln.sequences[0].string)
@@ -29,7 +29,7 @@ class RawModelingTests(unittest.TestCase):
tpl=io.LoadPDB('data/raw-modeling/gly.pdb')
aln=io.LoadAlignment('data/raw-modeling/del.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
residues=result.model.residues
self.assertEqual(len(result.gaps), 1)
self.assertEqual(result.gaps[0].before, residues[2])
@@ -41,7 +41,7 @@ class RawModelingTests(unittest.TestCase):
tpl=io.LoadPDB('data/raw-modeling/gly.pdb')
aln=io.LoadAlignment('data/raw-modeling/ins.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
residues=result.model.residues
self.assertEqual(len(result.gaps), 1)
self.assertEqual(result.gaps[0].before, residues[1])
@@ -54,7 +54,7 @@ class RawModelingTests(unittest.TestCase):
tpl=io.LoadPDB('data/raw-modeling/gly.pdb')
aln=io.LoadAlignment('data/raw-modeling/ter.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
residues=result.model.residues
self.assertEqual(len(result.gaps), 2)
self.assertEqual(result.gaps[0].before, mol.ResidueHandle())
@@ -69,7 +69,7 @@ class RawModelingTests(unittest.TestCase):
tpl=io.LoadPDB('data/raw-modeling/sep.pdb')
aln=io.LoadAlignment('data/raw-modeling/sep.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
residues=result.model.residues
self.assertEqual(len(residues), 1)
self.assertEqual(len(residues[0].atoms), 6)
@@ -85,7 +85,7 @@ class RawModelingTests(unittest.TestCase):
tpl=io.LoadPDB('data/raw-modeling/cbeta.pdb')
aln=io.LoadAlignment('data/raw-modeling/cbeta.fasta')
aln.AttachView(1, tpl.CreateFullView())
- result=BuildRawModel(aln)
+ result=meld.BuildRawModel(aln)
residues=result.model.residues
assert not residues[0].FindAtom("CB").IsValid()
assert not residues[1].FindAtom("CB").IsValid()
--
GitLab