r3050 - in /branches/error_import: data/diff_tensor.py errors.py relax relax_errors.py relax_warnings.py warnings.py -- February 27, 2007 - 06:45

Author: bugman
Date: Tue Feb 27 06:40:02 2007
New Revision: 3050

URL: http://svn.gna.org/viewcvs/relax?rev=3050&view=rev
Log:
Renamed the RelaxError and RelaxWarning modules.

The 'errors' module is now called 'relax_errors' and the 'warnings' module is 
now 'relax_warnings'.


Added:
    branches/error_import/relax_errors.py
      - copied unchanged from r3038, branches/error_import/errors.py
    branches/error_import/relax_warnings.py
      - copied, changed from r3043, branches/error_import/warnings.py
Removed:
    branches/error_import/errors.py
    branches/error_import/warnings.py
Modified:
    branches/error_import/data/diff_tensor.py
    branches/error_import/relax

Modified: branches/error_import/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/error_import/data/diff_tensor.py?rev=3050&r1=3049&r2=3050&view=diff
==============================================================================
--- branches/error_import/data/diff_tensor.py (original)
+++ branches/error_import/data/diff_tensor.py Tue Feb 27 06:40:02 2007
@@ -25,8 +25,8 @@
 from types import ListType
 
 from data_classes import Element, SpecificData
-from errors import RelaxError
 from generic_fns.diffusion_tensor import calc_Diso, calc_Dpar, 
calc_Dpar_unit, calc_Dper, calc_Dratio, calc_Dx, calc_Dx_unit, calc_Dy, 
calc_Dy_unit, calc_Dz, calc_Dz_unit, calc_rotation, calc_tensor, 
calc_tensor_diag
+from relax_errors import RelaxError
 
 
 

Modified: branches/error_import/relax
URL: 
http://svn.gna.org/viewcvs/relax/branches/error_import/relax?rev=3050&r1=3049&r2=3050&view=diff
==============================================================================
--- branches/error_import/relax (original)
+++ branches/error_import/relax Tue Feb 27 06:40:02 2007
@@ -66,18 +66,18 @@
 # relax modules.
 from colour import Colour
 from data.main import Data
-import errors
 from io import IO
 from generic_fns.main import Generic
 from prompt.gpl import gpl
 from prompt.interpreter import Interpreter
+import relax_errors
+import relax_warnings
 from specific_fns.main import Specific
 from specific_fns.specific_setup import Specific_setup
 from test_suite.runner import Test_suite_runner
 from test_suite.unit_tests.unit_test_runner import Run_unit_tests
 from thread_classes import Threading, ThreadData
 import version
-import warnings
 
 sys.path.append(sys.path[0])
 sys.path[0] = '.'
@@ -134,15 +134,15 @@
         mode, log_file, tee_file = self.arguments()
 
         # Set up the debugging flag.
-        errors.Debug = self.Debug
-        warnings.Debug = self.Debug
+        relax_errors.Debug = self.Debug
+        relax_warnings.Debug = self.Debug
 
         # Set up the pedantic flag.
-        warnings.Pedantic = self.Pedantic
+        relax_warnings.Pedantic = self.Pedantic
 
         # Place the class instance into the RelaxError and RelaxWarning 
modules as global variables.
-        errors.relax = self
-        warnings.relax = self
+        relax_errors.relax = self
+        relax_warnings.relax = self
 
         # Show the version number and exit.
         if mode == 'version':

Copied: branches/error_import/relax_warnings.py (from r3043, 
branches/error_import/warnings.py)
URL: 
http://svn.gna.org/viewcvs/relax/branches/error_import/relax_warnings.py?p2=branches/error_import/relax_warnings.py&p1=branches/error_import/warnings.py&r1=3043&r2=3050&rev=3050&view=diff
==============================================================================
--- branches/error_import/warnings.py (original)
+++ branches/error_import/relax_warnings.py Tue Feb 27 06:40:02 2007
@@ -23,7 +23,7 @@
 import warnings
 import inspect
 
-from errors import BaseError
+from relax_errors import BaseError
 
 
 # Global variables.