BF: some errors with script compiling since PEP8 refactor

buildCompleteInstaller.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "PsychoPy2"
-!define PRODUCT_VERSION "1.84.0"
+!define PRODUCT_VERSION "1.84.2"
 !define PRODUCT_PUBLISHER "Jon Peirce"
 !define PRODUCT_WEB_SITE "http://www.psychopy.org"
 ;!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AppMainExe.exe"

psychopy/CHANGELOG.txt

@@ -12,6 +12,14 @@ Changelog
 PsychoPy 1.84
 ------------------------------
 
+PsychoPy 1.84.2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* FIXED:
+
+  * Problem with renaming of Routines preventing experiment from re-loading #1248
+  * Fix to code generation for Static Components and some Keyboard Components (with variable "allowed keys" settings)
+
 PsychoPy 1.84.1
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

psychopy/__init__.py

@@ -10,7 +10,7 @@
 import sys
 
 # version info for PsychoPy
-__version__ = '1.84.1'
+__version__ = '1.84.2'
 __license__ = 'GNU GPLv3 (or more recent equivalent)'
 __author__ = 'Jonathan Peirce'
 __author_email__ = 'jon@peirce.org.uk'

psychopy/app/builder/components/mouse/__init__.py

@@ -194,7 +194,7 @@ def writeRoutineEndCode(self, buff):
             code = ("# store data for %s (%s)\n" %
                     (currLoop.params['name'], currLoop.type))
 
-        buff.writeIndented(code)
+        buff.writeIndentedLines(code)
 
         if store == 'final':
             # buff.writeIndented("# get info about the %(name)s\n"
@@ -212,7 +212,7 @@ def writeRoutineEndCode(self, buff):
                     "%s.addData('%s.midButton', buttons[1])\n" % vals +
                     "%s.addData('%s.rightButton', buttons[2])\n" % vals)
 
-            buff.writeIndented(code)
+            buff.writeIndentedLines(code)
         elif store != 'never':
             # buff.writeIndented("# save %(name)s data\n" %(self.params))
             for property in ['x', 'y', 'leftButton', 'midButton',

psychopy/app/builder/experiment.py

@@ -865,9 +865,13 @@ def writeLoopStartCode(self, buff):
         # write the code
         code = ("\n# set up handler to look after randomisation of conditions etc\n"
                 "%(name)s = data.TrialHandler(nReps=%(nReps)s, method=%(loopType)s, \n"
-                "    extraInfo=expInfo, originPath=-1,\n"
-                "    trialList=" + condsStr + ",\n"  # conditions go here
-                "    seed=%(random seed)s, name='%(name)s')\n")
+                "    extraInfo=expInfo, originPath=-1,\n")
+        buff.writeIndentedLines(code % inits)
+        # the next line needs to be kept separate to preserve potential string formatting 
+        # by the user in condStr (i.e. it shouldn't be a formatted string itself
+        code = "    trialList=" + condsStr + ",\n"  # conditions go here
+        buff.writeIndented(code)
+        code = "    seed=%(random seed)s, name='%(name)s')\n"
         buff.writeIndentedLines(code % inits)
 
         code = ("thisExp.addLoop(%(name)s)  # add the loop to the experiment\n" +

version

@@ -1 +1 @@
-1.84.1
+1.84.2