diff --git a/modules/bindings/pymod/clustalw.py b/modules/bindings/pymod/clustalw.py index e737cea57baf6c7d19bd6b04874f640d379989d0..6f0434da5b79c00cc02f45d01ceeeab4ceab8b52 100644 --- a/modules/bindings/pymod/clustalw.py +++ b/modules/bindings/pymod/clustalw.py @@ -13,8 +13,8 @@ def ClustalW(seq1, seq2=None, clustalw=None, keep_files=False, nopgap=False): seq_list.AddSequence(seq1) seq_list.AddSequence(seq2) elif isinstance(seq1, str) and isinstance(seq2, str): - seqh1=CreateSequence("seq1", seq1) - seqh2=CreateSequence("seq2", seq2) + seqh1=seq.CreateSequence("seq1", seq1) + seqh2=seq.CreateSequence("seq2", seq2) seq_list=seq.CreateSequenceList() seq_list.AddSequence(seqh1) seq_list.AddSequence(seqh2) diff --git a/modules/bindings/tests/test_clustalw.py b/modules/bindings/tests/test_clustalw.py index cf8b2753ee13f39603ba05f86e55be43708cacb0..010b636eb7bc249a86e84516dad81ca27c00b646 100644 --- a/modules/bindings/tests/test_clustalw.py +++ b/modules/bindings/tests/test_clustalw.py @@ -15,6 +15,8 @@ class TestClustalWBindings(unittest.TestCase): self.pw_alignment = io.LoadAlignment("testfiles/pairwise_aln.fasta") self.nopgap_pw_alignment = io.LoadAlignment("testfiles/nopgap_pairwise_aln.fasta") self.mult_alignment = io.LoadAlignment("testfiles/multiple_aln.fasta") + self.strseq1 = self.targetseq.GetGaplessString() + self.strseq2 = self.templseq.GetGaplessString() def testPairwiseClustalW(self): aln=clustalw.ClustalW(self.targetseq, self.templseq) @@ -36,6 +38,13 @@ class TestClustalWBindings(unittest.TestCase): assert self.mult_alignment.ToString(80) == aln.ToString(80), \ "Multiple alignment differs from precomputed one" + def testStringClustalW(self): + aln=clustalw.ClustalW(self.strseq1, self.strseq2) + aln.SetSequenceName(0,self.targetseq.GetName()) + aln.SetSequenceName(1,self.templseq.GetName()) + assert self.pw_alignment.ToString(80) == aln.ToString(80), \ + "Pairwise alignment using two strings differs from precomputed one \n%s \n%s" \ + %(self.pw_alignment.ToString(80),aln.ToString(80)) if __name__ == "__main__": # test if clustalw package is available on system, otherwise ignore tests