Author: bugman
Date: Sun Jan 11 15:46:03 2009
New Revision: 8380
URL: http://svn.gna.org/viewcvs/relax?rev=8380&view=rev
Log:
Import fixes for pystarlib, as they were all screwed up.
This allows the unit test framework to function and allows importing of the
code into relax.
Modified:
branches/bmrb/pystarlib/File.py
branches/bmrb/pystarlib/FileTest.py
branches/bmrb/pystarlib/SaveFrame.py
branches/bmrb/pystarlib/SaveFrameTest.py
branches/bmrb/pystarlib/TagTable.py
branches/bmrb/pystarlib/TagTableTest.py
branches/bmrb/pystarlib/Text.py
branches/bmrb/pystarlib/TextTest.py
branches/bmrb/pystarlib/testAll.py
Modified: branches/bmrb/pystarlib/File.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/File.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/File.py (original)
+++ branches/bmrb/pystarlib/File.py Sun Jan 11 15:46:03 2009
@@ -1,20 +1,20 @@
"""
Classes for dealing with STAR syntax
"""
-from STAR import Utils
-from STAR.Utils import Lister
-from STAR.TagTable import TagTable
-from STAR.Text import comments_strip
-from STAR.Text import semicolon_block_collapse
-from STAR.Text import nmrView_compress
-from STAR.Text import pattern_save_begin
-from STAR.Text import pattern_save_end
-from STAR.Text import pattern_tagtable_loop
-from STAR.Text import pattern_save_begin_nws
-from STAR.Text import pattern_save_end_nws
-from STAR.Text import pattern_tag_name_nws
-from STAR.Text import pattern_tagtable_loop_nws
-from STAR.SaveFrame import SaveFrame
+import Utils
+from Utils import Lister
+from TagTable import TagTable
+from Text import comments_strip
+from Text import semicolon_block_collapse
+from Text import nmrView_compress
+from Text import pattern_save_begin
+from Text import pattern_save_end
+from Text import pattern_tagtable_loop
+from Text import pattern_save_begin_nws
+from Text import pattern_save_end_nws
+from Text import pattern_tag_name_nws
+from Text import pattern_tagtable_loop_nws
+from SaveFrame import SaveFrame
import os
import re
#import profile
Modified: branches/bmrb/pystarlib/FileTest.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/FileTest.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/FileTest.py (original)
+++ branches/bmrb/pystarlib/FileTest.py Sun Jan 11 15:46:03 2009
@@ -1,8 +1,8 @@
"""Unit test
"""
-from STAR.File import File
-from STAR import Utils
-import STAR
+from File import File
+import Utils
+import __init__
import os
import zipfile
@@ -68,7 +68,7 @@
def testEntry(entry):
print "Testing Entry"
strf = File()
- STAR.verbosity = 2
+ __init__.verbosity = 2
# Freely available on the web so not included in package.
stage = "2-parsed"
# stage = "3-converted-DOCR"
@@ -177,4 +177,4 @@
testAllEntries()
# testSingleFile("S:\\jurgen\\2hgh_small_new_google.str")
# unittest.main()
- print "Done with STAR.FileTest"
+ print "Done with STAR.FileTest"
Modified: branches/bmrb/pystarlib/SaveFrame.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/SaveFrame.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/SaveFrame.py (original)
+++ branches/bmrb/pystarlib/SaveFrame.py Sun Jan 11 15:46:03 2009
@@ -1,7 +1,7 @@
"""
Classes for dealing with STAR syntax
"""
-from STAR.Utils import Lister
+from Utils import Lister
"""
@@ -74,4 +74,4 @@
return tT.tagvalues[0][0]
-
+
Modified: branches/bmrb/pystarlib/SaveFrameTest.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/SaveFrameTest.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/SaveFrameTest.py (original)
+++ branches/bmrb/pystarlib/SaveFrameTest.py Sun Jan 11 15:46:03 2009
@@ -2,10 +2,10 @@
Unit test for SaveFrameTest.py
Setup taken from "Dive Into Python"
"""
-from STAR.TagTable import TagTable
+from TagTable import TagTable
import unittest
from unittest import TestCase
-from STAR.SaveFrame import SaveFrame
+from SaveFrame import SaveFrame
class AllChecks(TestCase):
Modified: branches/bmrb/pystarlib/TagTable.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/TagTable.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/TagTable.py (original)
+++ branches/bmrb/pystarlib/TagTable.py Sun Jan 11 15:46:03 2009
@@ -1,21 +1,21 @@
"""
Classes for dealing with STAR syntax
"""
-from STAR.Text import pattern_quotes_needed
-from STAR.Text import quotes_add
-from STAR.Text import pattern_quotes_needed_2
-from STAR.Text import pattern_quoted
-from STAR.Text import tag_value_quoted_parse
-from STAR.Text import pattern_tags_loop
-from STAR.Text import pattern_tags_loop_2
-from STAR.Text import pattern_tagname_2
-from STAR.Text import pattern_tagtable_stop_2
-from STAR.Text import pattern_tagtable_loop_2
-from STAR.Text import pattern_unquoted_find
-from STAR.Text import pattern_tag_name
-from STAR.Text import tag_value_parse
-from STAR.Utils import Lister
-from STAR.Utils import transpose
+from Text import pattern_quotes_needed
+from Text import quotes_add
+from Text import pattern_quotes_needed_2
+from Text import pattern_quoted
+from Text import tag_value_quoted_parse
+from Text import pattern_tags_loop
+from Text import pattern_tags_loop_2
+from Text import pattern_tagname_2
+from Text import pattern_tagtable_stop_2
+from Text import pattern_tagtable_loop_2
+from Text import pattern_unquoted_find
+from Text import pattern_tag_name
+from Text import tag_value_parse
+from Utils import Lister
+from Utils import transpose
import string
import types
import re
@@ -474,4 +474,4 @@
# Set the title
self.set_title()
- return None
+ return None
Modified: branches/bmrb/pystarlib/TagTableTest.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/TagTableTest.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/TagTableTest.py (original)
+++ branches/bmrb/pystarlib/TagTableTest.py Sun Jan 11 15:46:03 2009
@@ -1,6 +1,6 @@
from unittest import TestCase
-from STAR.TagTable import TagTable
-import STAR
+from TagTable import TagTable
+import __init__
#from TagTable import *
#from SaveFrame import *
import unittest
@@ -9,13 +9,13 @@
class AllChecks(TestCase):
def testcheck_integrity(self):
"""TagTable"""
- STAR.verbosity = 2
+ __init__.verbosity = 2
## text = """_A a _B "b'" """; free = 1
text = """_A a b c d e"""; free = None
tt = TagTable( free = free,
tagnames = [],
tagvalues = [],
- verbosity = STAR.verbosity)
+ verbosity = __init__.verbosity)
pos = tt.parse( text = text, pos = 0)
self.assertEqual(pos,len(text))
Modified: branches/bmrb/pystarlib/Text.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/Text.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/Text.py (original)
+++ branches/bmrb/pystarlib/Text.py Sun Jan 11 15:46:03 2009
@@ -10,7 +10,7 @@
import string, re
## BMRB modules
-import STAR # Actually the current package
+import __init__ # Actually the current package
"""
Some handy patterns and functions for dealing with text in the STAR syntax.
@@ -374,7 +374,7 @@
# Original code: can't handle re matches that are too long
#text, count = pattern_semicolon_block.subn( semicolon_block_replace,
text )
- if STAR.verbosity >= 9:
+ if __init__.verbosity >= 9:
print 'Done [%s] subs with semicolon blocks' % count
return text
@@ -491,7 +491,7 @@
count += 1
i += 1
- if STAR.verbosity >= 9:
+ if __init__.verbosity >= 9:
print 'Done [%s] comment subs' % count
text = string.join(lines,"\n")
return text
Modified: branches/bmrb/pystarlib/TextTest.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/TextTest.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/TextTest.py (original)
+++ branches/bmrb/pystarlib/TextTest.py Sun Jan 11 15:46:03 2009
@@ -1,5 +1,5 @@
from unittest import TestCase
-from STAR.Text import comments_strip
+from Text import comments_strip
import unittest
Modified: branches/bmrb/pystarlib/testAll.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/pystarlib/testAll.py?rev=8380&r1=8379&r2=8380&view=diff
==============================================================================
--- branches/bmrb/pystarlib/testAll.py (original)
+++ branches/bmrb/pystarlib/testAll.py Sun Jan 11 15:46:03 2009
@@ -6,11 +6,11 @@
"""
if __name__ == "__main__":
modList = (
- "STAR.TextTest",
- "STAR.UtilsTest",
- "STAR.TagTableTest",
- "STAR.SaveFrameTest",
- "STAR.FileTest",
+ "TextTest",
+ "UtilsTest",
+ "TagTableTest",
+ "SaveFrameTest",
+ "FileTest",
)
# Next line is to fool pydev extensions into thinking suite is defined
in the regular way.
suite = None
r8380 - /branches/bmrb/pystarlib/