r28009 - /trunk/test_suite/shared_data/frame_order/cam/generate_base.py -- October 06, 2015 - 09:33

Author: bugman
Date: Tue Oct  6 09:33:42 2015
New Revision: 28009

URL: http://svn.gna.org/viewcvs/relax?rev=28009&view=rev
Log:
MS Windows fix for the Frame_order.test_generate_rotor2_distribution system 
test.

The locale.setlocale() function call for correctly setting up a spinning 
progress meter was failing
on MS Windows.  The error is now caught and the local setting skipped.


Modified:
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py

Modified: trunk/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/generate_base.py?rev=28009&r1=28008&r2=28009&view=diff
==============================================================================
--- trunk/test_suite/shared_data/frame_order/cam/generate_base.py       
(original)
+++ trunk/test_suite/shared_data/frame_order/cam/generate_base.py       Tue 
Oct  6 09:33:42 2015
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2012-2014 Edward d'Auvergne                                  
 #
+# Copyright (C) 2012-2015 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -89,7 +89,10 @@
         self.interpreter.on(verbose=False)
 
         # Set up for the progress meter (commas between the thousands).
-        locale.setlocale(locale.LC_ALL, 'en_US')
+        try:
+            locale.setlocale(locale.LC_ALL, 'en_US')
+        except:
+            pass
 
         # Build the axis system.
         self.build_axes()