r15689 - in /1.3: relax.py setup.py -- April 05, 2012 - 12:16

Author: bugman
Date: Thu Apr  5 12:16:43 2012
New Revision: 15689

URL: http://svn.gna.org/viewcvs/relax?rev=15689&view=rev
Log:
Bug fix for Mac OS X - attempt at killing the Carbon.Evt.TickCount problem by 
removing argv emulation.

See https://mail.gna.org/public/relax-users/2012-04/msg00004.html
(Message-id: 
<CAED9pY9U7fqqj=Oq6UyCKV-+zw-Py-9kkq-X-eUnmpseegk9vQ@xxxxxxxxxxxxxx>),
https://mail.gna.org/public/relax-users/2012-03/msg00047.html
(Message-id: <15983F01-ECC5-4C70-BC56-5D07A903C489@xxxxxxxxxxxxx>) and other 
messages in these
threads.

The suggestion from
http://stackoverflow.com/questions/3461983/evt-tickcount-not-found-with-python2-6-on-osx-10-6-3
 was
used, where the py2app 'argv_emulation' option is set to false.  For this to 
work in relax, the
command line argument parsing had to be turned off and default values set in 
the Relax() instance
namespace.


Modified:
    1.3/relax.py
    1.3/setup.py

Modified: 1.3/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/relax.py?rev=15689&r1=15688&r2=15689&view=diff
==============================================================================
--- 1.3/relax.py (original)
+++ 1.3/relax.py Thu Apr  5 12:16:43 2012
@@ -79,12 +79,21 @@
     # Normal relax operation.
     relax = Relax()
 
+    # Override normal operation.
+    if mode:
+        # Override the mode.
+        relax.mode = mode
+
+        # Some defaults.
+        relax.script_file = None
+        relax.log_file = None
+        relax.tee_file = None
+        relax.multiprocessor_type = 'uni'
+        relax.n_processors = 1
+
     # Process the command line arguments.
-    relax.arguments()
-
-    # Override the mode.
-    if mode:
-        relax.mode = mode
+    else:
+        relax.arguments()
 
     # Set up the multi-processor elements.
     callbacks = Application_callback(master=relax)

Modified: 1.3/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/setup.py?rev=15689&r1=15688&r2=15689&view=diff
==============================================================================
--- 1.3/setup.py (original)
+++ 1.3/setup.py Thu Apr  5 12:16:43 2012
@@ -57,7 +57,7 @@
     NAME = 'relax'
     VERSION = version_full()
     OPTIONS = {
-        'argv_emulation': True,
+        'argv_emulation': False,
         'iconfile': status.install_path + sep + 'graphics' + sep + 
'ulysses_shadowless_trans_128x128.icns',
         'packages': 'wx',
         'site_packages': True,