r16014 - /branches/uf_redesign/prompt/objects.py -- May 05, 2012 - 23:08

Author: bugman
Date: Sat May  5 23:08:39 2012
New Revision: 16014

URL: http://svn.gna.org/viewcvs/relax?rev=16014&view=rev
Log:
Fix for the auto-generated user functions - the argument defaults are now 
properly set.


Modified:
    branches/uf_redesign/prompt/objects.py

Modified: branches/uf_redesign/prompt/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/objects.py?rev=16014&r1=16013&r2=16014&view=diff
==============================================================================
--- branches/uf_redesign/prompt/objects.py (original)
+++ branches/uf_redesign/prompt/objects.py Sat May  5 23:08:39 2012
@@ -89,18 +89,13 @@
                 uf_kargs[self._kargs[i]['name']] = uf_args[i]
 
         # Set the argument defaults.
-        values = []
         for i in range(self._karg_num):
             # The keyword.
             name = self._kargs[i]['name']
 
-            # The user supplied value.
-            if name in keys:
-                values.append(uf_kargs[name])
-
-            # The default.
-            else:
-                values.append(self._kargs[i]['default'])
+            # Set the default if the user has not supplied a value.
+            if name not in uf_kargs.keys():
+                uf_kargs[name] = self._kargs[i]['default']
 
         # Function intro text.
         if status.prompt_intro:
@@ -114,7 +109,7 @@
                     text += ", "
 
                 # Add the arg.
-                text += "%s=%s" % (self._kargs[i]['name'], repr(values[i]))
+                text += "%s=%s" % (self._kargs[i]['name'], 
repr(uf_kargs[self._kargs[i]['name']]))
 
             # The end.
             text += ")"