r19074 - in /trunk: generic_fns/__init__.py generic_fns/sys_info.py info.py user_functions/sys_info.py -- March 23, 2013 - 18:31

Author: bugman
Date: Sat Mar 23 18:31:38 2013
New Revision: 19074

URL: http://svn.gna.org/viewcvs/relax?rev=19074&view=rev
Log:
Merged the generic_fns.sys_info module into the info module.


Removed:
    trunk/generic_fns/sys_info.py
Modified:
    trunk/generic_fns/__init__.py
    trunk/info.py
    trunk/user_functions/sys_info.py

Modified: trunk/generic_fns/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/__init__.py?rev=19074&r1=19073&r2=19074&view=diff
==============================================================================
--- trunk/generic_fns/__init__.py (original)
+++ trunk/generic_fns/__init__.py Sat Mar 23 18:31:38 2013
@@ -60,7 +60,6 @@
             'spectrum',
             'state',
             'structure',
-            'sys_info',
             'temperature',
             'value',
             'vmd'

Removed: trunk/generic_fns/sys_info.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/sys_info.py?rev=19073&view=auto
==============================================================================
--- trunk/generic_fns/sys_info.py (original)
+++ trunk/generic_fns/sys_info.py (removed)
@@ -1,36 +1,0 @@
-###############################################################################
-#                                                                            
 #
-# Copyright (C) 2011 Edward d'Auvergne                                       
 #
-#                                                                            
 #
-# This file is part of the program relax (http://www.nmr-relax.com).         
 #
-#                                                                            
 #
-# This program is free software: you can redistribute it and/or modify       
 #
-# it under the terms of the GNU General Public License as published by       
 #
-# the Free Software Foundation, either version 3 of the License, or          
 #
-# (at your option) any later version.                                        
 #
-#                                                                            
 #
-# This program is distributed in the hope that it will be useful,            
 #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of             
 #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              
 #
-# GNU General Public License for more details.                               
 #
-#                                                                            
 #
-# You should have received a copy of the GNU General Public License          
 #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.      
 #
-#                                                                            
 #
-###############################################################################
-
-# Module docstring.
-"""Module for displaying system information."""
-
-# relax module imports.
-from info import Info_box
-
-
-def sys_info():
-    """Display the system information."""
-
-    # Initialise the info box.
-    info = Info_box()
-
-    # Print all info.
-    print(info.sys_info())

Modified: trunk/info.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/info.py?rev=19074&r1=19073&r2=19074&view=diff
==============================================================================
--- trunk/info.py (original)
+++ trunk/info.py Sat Mar 23 18:31:38 2013
@@ -48,6 +48,17 @@
 # relax module imports.
 from status import Status; status = Status()
 from version import revision, url, version, version_full
+
+
+def print_sys_info():
+    """Print out the system information."""
+
+    # Initialise the info box.
+    info = Info_box()
+
+    # Print all info.
+    print(info.sys_info())
+
 
 
 class Info_box(object):

Modified: trunk/user_functions/sys_info.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/sys_info.py?rev=19074&r1=19073&r2=19074&view=diff
==============================================================================
--- trunk/user_functions/sys_info.py (original)
+++ trunk/user_functions/sys_info.py Sat Mar 23 18:31:38 2013
@@ -23,7 +23,7 @@
 """The sys_info user function definitions."""
 
 # relax module imports.
-from generic_fns.sys_info import sys_info
+from info import print_sys_info
 from graphics import WIZARD_IMAGE_PATH
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.objects import Desc_container
@@ -37,7 +37,7 @@
 # Description.
 uf.desc.append(Desc_container())
 uf.desc[-1].add_paragraph("This will display all of the relax, Python, 
python package and hardware information currently being used by relax.  This 
is useful for seeing if all packages are up to date and if the correct 
software versions are being used.  It is also very useful information for 
reporting relax bugs.")
-uf.backend = sys_info
+uf.backend = print_sys_info
 uf.menu_text = "s&ys_info"
 uf.gui_icon = "oxygen.actions.help-about"
 uf.wizard_size = (700, 400)