r14549 - in /1.3: gui/controller.py status.py -- August 31, 2011 - 14:55

Author: bugman
Date: Wed Aug 31 14:55:32 2011
New Revision: 14549

URL: http://svn.gna.org/viewcvs/relax?rev=14549&view=rev
Log:
Changed the debugging print outs for the status module.


Modified:
    1.3/gui/controller.py
    1.3/status.py

Modified: 1.3/gui/controller.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/controller.py?rev=14549&r1=14548&r2=14549&view=diff
==============================================================================
--- 1.3/gui/controller.py (original)
+++ 1.3/gui/controller.py Wed Aug 31 14:55:32 2011
@@ -780,36 +780,11 @@
                 continue
 
             # Debugging - the relax lock.
-            elif msg[1:12] == 'relax lock>':
-                # Add a new line to the last block.
-                string_list[-1] += '\n'
-
-                # Add the prompt part.
-                string_list.append('relax lock>')
+            elif msg[0:6] == 'debug>':
+                # Add the debugging text.
+                string_list.append(msg)
                 stream_list.append(4)
-
-                # Shorten the message.
-                msg = msg[12:]
-
-                # Start a new section.
-                string_list.append('')
-                stream_list.append(stream)
-
-            # Debugging - the relax observers.
-            elif msg[1:16] == 'relax observer>':
-                # Add a new line to the last block.
-                string_list[-1] += '\n'
-
-                # Add the prompt part.
-                string_list.append('relax observer>')
-                stream_list.append(4)
-
-                # Shorten the message.
-                msg = msg[16:]
-
-                # Start a new section.
-                string_list.append('')
-                stream_list.append(stream)
+                continue
 
             # A different stream.
             if stream_list[-1] != stream:

Modified: 1.3/status.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/status.py?rev=14549&r1=14548&r2=14549&view=diff
==============================================================================
--- 1.3/status.py (original)
+++ 1.3/status.py Wed Aug 31 14:55:32 2011
@@ -374,7 +374,7 @@
         for key in self._keys:
             # Debugging.
             if self._status.debug:
-                sys.stdout.write("\nrelax observer> Observer '%s' notifying 
'%s'.\n" % (self._name, key))
+                sys.stdout.write("debug> Observer '%s' notifying '%s'.\n" % 
(self._name, key))
 
             # Call the method.
             self._callback[key]()
@@ -395,7 +395,7 @@
 
         # Debugging.
         if self._status.debug:
-            sys.stdout.write("\nrelax observer> Observer '%s' registering 
'%s'.\n" % (self._name, key))
+            sys.stdout.write("debug> Observer '%s' registering '%s'.\n" % 
(self._name, key))
 
         # Add the method to the dictionary of callbacks.
         self._callback[key] = method
@@ -409,7 +409,7 @@
 
         # Debugging.
         if self._status.debug:
-            sys.stdout.write("\nrelax observer> Resetting observer '%s'.\n" 
% self._name)
+            sys.stdout.write("debug> Resetting observer '%s'.\n" % 
self._name)
 
         # Reinitialise the dictionary of callback methods.
         self._callback = {}
@@ -431,7 +431,7 @@
 
         # Debugging.
         if self._status.debug:
-            sys.stdout.write("\nrelax observer> Observer '%s' unregistering 
'%s'.\n" % (self._name, key))
+            sys.stdout.write("debug> Observer '%s' unregistering '%s'.\n" % 
(self._name, key))
 
         # Remove the method from the dictionary of callbacks.
         self._callback.pop(key)
@@ -478,7 +478,7 @@
 
         # Debugging.
         if self.status.debug:
-            sys.stdout.write("\nrelax lock>  Acquisition of '%s' by '%s'.\n" 
% (self.name, acquirer))
+            sys.stdout.write("debug> Acquisition of '%s' by '%s'.\n" % 
(self.name, acquirer))
 
         # Fake lock.
         if self.fake_lock:
@@ -515,7 +515,7 @@
 
         # Debugging.
         if self.status.debug:
-            sys.stdout.write("\nrelax lock>  Release of '%s' by '%s'.\n" % 
(self.name, acquirer))
+            sys.stdout.write("debug> Release of '%s' by '%s'.\n" % 
(self.name, acquirer))
 
         # Fake lock.
         if self.fake_lock: