r15955 - /branches/uf_redesign/prompt/bmrb.py -- May 04, 2012 - 10:45

Author: bugman
Date: Fri May  4 10:45:54 2012
New Revision: 15955

URL: http://svn.gna.org/viewcvs/relax?rev=15955&view=rev
Log:
Fix for the bmrb.citation user function prompt front end.

The status argument was hiding the relax status singleton object!


Modified:
    branches/uf_redesign/prompt/bmrb.py

Modified: branches/uf_redesign/prompt/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/bmrb.py?rev=15955&r1=15954&r2=15955&view=diff
==============================================================================
--- branches/uf_redesign/prompt/bmrb.py (original)
+++ branches/uf_redesign/prompt/bmrb.py Fri May  4 10:45:54 2012
@@ -29,7 +29,7 @@
 import arg_check
 from generic_fns import bmrb, exp_info
 from relax_errors import RelaxBoolError, RelaxIntError, RelaxNoneStrError, 
RelaxStrError, RelaxStrFileError
-from status import Status; status = Status()
+from status import Status; status_obj = Status()
 
 
 class BMRB(User_fn_class):
@@ -37,8 +37,8 @@
 
     def citation(self, cite_id=None, authors=None, doi=None, pubmed_id=None, 
full_citation=None, title=None, status='published', type='journal', 
journal_abbrev=None, journal_full=None, volume=None, issue=None, 
page_first=None, page_last=None, year=None):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.citation("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.citation("
             text = text + "cite_id=" + repr(cite_id)
             text = text + ", authors=" + repr(authors)
             text = text + ", doi=" + repr(doi)
@@ -140,8 +140,8 @@
 
     def display(self, version=None):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.display("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.display("
             text = text + "version=" + repr(version) + ")"
             print(text)
 
@@ -156,8 +156,8 @@
 
     def read(self, file=None, dir=None, version=None, 
sample_conditions=None):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.read("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.read("
             text = text + "file=" + repr(file)
             text = text + ", dir=" + repr(dir)
             text = text + ", version=" + repr(version)
@@ -190,8 +190,8 @@
 
     def script(self, file='reduced', dir=None, analysis_type=None, 
model_selection=None, engine='relax', model_elim=False, 
universal_solution=False):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.script("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.script("
             text = text + "file=" + repr(file)
             text = text + ", dir=" + repr(dir)
             text = text + ", analysis_type=" + repr(analysis_type)
@@ -273,8 +273,8 @@
 
     def software(self, name=None, version=None, url=None, vendor_name=None, 
cite_ids=None, tasks=None):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.software("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.software("
             text = text + "name=" + repr(name)
             text = text + ", version=" + repr(version)
             text = text + ", url=" + repr(url)
@@ -334,8 +334,8 @@
 
     def software_select(self, name=None, version=None):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.software_select("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.software_select("
             text = text + "name=" + repr(name)
             text = text + ", version=" + repr(version) + ")"
             print(text)
@@ -375,8 +375,8 @@
 
     def thiol_state(self, state='reduced'):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.thiol_state("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.thiol_state("
             text = text + "state=" + repr(state) + ")"
             print(text)
 
@@ -420,8 +420,8 @@
 
     def write(self, file=None, dir='pipe_name', version=None, force=False):
         # Function intro text.
-        if status.prompt_intro:
-            text = status.ps3 + "bmrb.write("
+        if status_obj.prompt_intro:
+            text = status_obj.ps3 + "bmrb.write("
             text = text + "file=" + repr(file)
             text = text + ", dir=" + repr(dir)
             text = text + ", version=" + repr(version)