RF: additional style tweaks, some demo BFs too

win.flip -> win.flip()
add return to last line in file

psychopy/demos/coder/basic/hello_world.py

@@ -30,4 +30,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/JND_staircase_analysis.py

@@ -15,7 +15,7 @@
 
 from psychopy import data, gui, core
 from psychopy.tools.filetools import fromFile
-import pylab, scipy
+import pylab
 import os
 
 # set to 0.5 for Yes/No (or PSE). Set to 0.8 for a 2AFC threshold
@@ -84,4 +84,4 @@
 
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/JND_staircase_exp.py

@@ -109,4 +109,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/TrialHandler.py

@@ -51,4 +51,4 @@
 trials.saveAsPickle(fileName = 'testData')  # this saves a copy of the whole object
 df = trials.saveAsWideText("testDataWide.txt")  # wide is useful for analysis with R or SPSS. Also returns dataframe df
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/autoDraw_autoLog.py

@@ -12,7 +12,7 @@
 
 from __future__ import division
 
-from psychopy import visual, core, event
+from psychopy import visual, core
 
 win = visual.Window([800, 800])
 
@@ -49,4 +49,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/experimentHandler.py

@@ -56,4 +56,4 @@
 print("Done. 'exp' experimentHandler will now (end of script) save data to testExp.csv")
 print(" and also to testExp.psydat, which is a pickled version of `exp`")
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/fMRI_launchScan.py

@@ -73,4 +73,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/gammaMotionAnalysis.py

@@ -67,4 +67,4 @@
 pylab.show()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/gammaMotionNull.py

@@ -95,7 +95,6 @@ def getResponse(direction):
     """if subject said up when direction was up ( + 1) then increase gamma
     Otherwise, decrease gamma"""
     event.clearEvents()  # clear the event buffer to start with
-    resp = None  # initially
 
     while 1:  # forever until we return
         for key in event.getKeys():
@@ -104,11 +103,10 @@ def getResponse(direction):
                 win.close()
                 # win.bits.reset()
                 core.quit()
-                return None
             # valid response - check to see if correct
             elif key in ['down', 'up']:
                 if ((key in ['down'] and direction == -1) or
-                    (key in ['up'] and direction == + 1)):
+                        (key in ['up'] and direction == +1)):
                     return 0
                 else:
                     return 1
@@ -120,7 +118,7 @@ def presentStimulus(direction):
     where:
         direction = + 1(up) or -1(down)
     """
-    junk = win.fps()
+    win.fps()
 
     startPhase = num.random.random()
     if direction == 1:
@@ -136,10 +134,10 @@ def presentStimulus(direction):
             for n in range(nFrames):
                 # present for several constant frames (TF)
                 thisStim.draw()
-                win.flip
+                win.flip()
 
     # then blank the screen
-    win.flip
+    win.flip()
 
 # run the staircase
 for trialN in range(info['nTrials']):
@@ -154,7 +152,7 @@ def presentStimulus(direction):
         ans = getResponse(direction)
         stairCase.addData(ans)
 
-win.flip
+win.flip()
 core.wait(0.5)
 
 win.close()
@@ -166,8 +164,8 @@ def presentStimulus(direction):
 stairCases[0].saveAsPickle(fileName + 'lo')
 stairCases[0].saveAsText(fileName + 'lo')
 
-print('That took %.1fmins' % (globalClock.getTime()/60.0))
+print('That took %.1fmins' % (globalClock.getTime() / 60.0))
 
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/logFiles.py

@@ -54,4 +54,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/experiment control/runtimeInfo.py

@@ -52,8 +52,7 @@
 
 print("\nYou can extract single items from info, using keys, e.g.:")
 print("  psychopyVersion = %s" % runInfo['psychopyVersion'])
-try:
-    runInfo["windowRefreshTimeAvg_ms"]  # just to raise exception here if no keys
+if "windowRefreshTimeAvg_ms" in runInfo.keys():
     print("or from the test of the screen refresh rate:")
     print("  %.2f ms = average refresh time" % runInfo["windowRefreshTimeAvg_ms"])
     print("  %.3f ms = standard deviation" % runInfo["windowRefreshTimeSD_ms"])
@@ -72,12 +71,11 @@
             print("""Try defining the window as full-screen (it's not currently), i.e. at the top of the demo change to:
     win = visual.Window((800, 600), fullscr=True, ...
 and re-run the demo.""")
-except Exception:
-    pass
+
 print("""
 (NB: The visual is not the demo! Scroll up to see the text output.)""")
 
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/CRS_BitsBox.py

@@ -74,4 +74,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/CRS_BitsPlusPlus.py

@@ -72,4 +72,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/cedrusRB730.py

@@ -37,4 +37,4 @@
 print('baseTime:', rb730.getBaseTimer())
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/egi_netstation.py

@@ -44,4 +44,4 @@
 # ns.finalize()
 
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/ioLab_bbox.py

@@ -63,4 +63,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/labjack_u3.py

@@ -57,4 +57,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/monitorDemo.py

@@ -27,4 +27,4 @@
     thisMon = monitors.Monitor(thisName)
     print(thisMon.getDistance())
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/parallelPortOutput.py

@@ -48,4 +48,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/hardware/testSoundLatency.py

@@ -127,4 +127,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/GUI.py

@@ -37,4 +37,4 @@
 else:
     print('user cancelled')
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/customMouse.py

@@ -43,4 +43,4 @@
 
 win.close()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/joystick_universal.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python2
 # -*- coding: utf-8 -*-
-from __future__ import print_function
 
 """
 There are two ways to retrieve info from the first 3 joystick axes. You can use:
@@ -16,6 +15,7 @@
 """
 
 from __future__ import division
+from __future__ import print_function
 
 from psychopy import visual, core, event
 from psychopy.hardware import joystick
@@ -84,4 +84,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/latencyFromTone.py

@@ -91,4 +91,4 @@ def plotYX(yaxis, xaxis, description=''):
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/mouse.py

@@ -65,4 +65,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/input/what_key.py

@@ -24,4 +24,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/iohub/keyboard.py

@@ -170,4 +170,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/iohub/keyboardreactiontime.py

@@ -94,4 +94,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/iohub/launchHub.py

@@ -160,4 +160,4 @@ def testEnabledDataStoreAutoSessionCode():
                print('Test Result: ', result)
                break
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/iohub/mouse.py

@@ -125,4 +125,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/iohub/xinputgamepad.py

@@ -134,4 +134,4 @@ def normalizedValue2Coord(normed_position, normed_magnitude, display_coord_area)
 
 # End of run.py Script #
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/misc/captureFrames.py

@@ -34,4 +34,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/misc/encrypt_data.py

@@ -47,4 +47,4 @@
 for file in [sf.file, pubkey, privkey, passphrase]:
     os.unlink(file)
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/stimuli/MoviePause.py

@@ -39,9 +39,9 @@
 mov.play()
 while globalClock.getTime() < (mov.duration + 1.0):
     mov.draw()
-    win.flip
+    win.flip()
 
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/stimuli/MovieStim.py

@@ -31,4 +31,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.

psychopy/demos/coder/stimuli/MovieStim2.py

@@ -111,4 +111,4 @@
 win.close()
 core.quit()
 
-# The contents of this file are in the public domain.
+# The contents of this file are in the public domain.