r18803 - in /branches/frame_order_testing: ./ compat.py -- March 12, 2013 - 16:45

Author: bugman
Date: Tue Mar 12 16:45:44 2013
New Revision: 18803

URL: http://svn.gna.org/viewcvs/relax?rev=18803&view=rev
Log:
Merged revisions 18801-18802 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18801 | bugman | 2013-03-12 16:34:16 +0100 (Tue, 12 Mar 2013) | 6 lines
  
  Added a more informative error message if the platform module is missing.
  
  This is for Python <= 2.2.  The file from 
http://hg.python.org/cpython/file/2.3/Lib/platform.py can
  simply be copied into the lib/pythonX.X/ directory to fix this.
........
  r18802 | bugman | 2013-03-12 16:34:57 +0100 (Tue, 12 Mar 2013) | 3 lines
  
  Slight change to the message printed if the platform module is missing.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/compat.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 12 16:45:44 2013
@@ -1,1 +1,1 @@
-/trunk:1-18799
+/trunk:1-18802

Modified: branches/frame_order_testing/compat.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/compat.py?rev=18803&r1=18802&r2=18803&view=diff
==============================================================================
--- branches/frame_order_testing/compat.py (original)
+++ branches/frame_order_testing/compat.py Tue Mar 12 16:45:44 2013
@@ -21,6 +21,13 @@
 
 # Module docstring.
 """Temporary module for allowing relax to support both Python 2 and 3."""
+
+# The platform script message.
+try:
+    import platform
+except ImportError:
+    print("The platform module cannot be imported.  For Python <= 2.2, try 
copying the platform.py file from 
http://hg.python.org/cpython/file/2.3/Lib/platform.py into your 
lib/pythonX.X/ directory.")
+    raise
 
 # Dependency check module.
 import dep_check