style: Various other PEP8 fixes in Python files

Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/SCsub b/drivers/SCsub
index 4ff770c7d..08a189272 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -5,31 +5,31 @@ Import('env')
 env.drivers_sources = []
 
 if ("builtin_zlib" in env and env["builtin_zlib"] == "yes"):
-    SConscript("zlib/SCsub");
+    SConscript("zlib/SCsub")
 
 # OS drivers
-SConscript('unix/SCsub');
-SConscript('windows/SCsub');
+SConscript('unix/SCsub')
+SConscript('windows/SCsub')
 
 # Sounds drivers
-SConscript('alsa/SCsub');
-SConscript('pulseaudio/SCsub');
+SConscript('alsa/SCsub')
+SConscript('pulseaudio/SCsub')
 if (env["platform"] == "windows"):
-    SConscript("rtaudio/SCsub");
+    SConscript("rtaudio/SCsub")
 if (env["xaudio2"] == "yes"):
-    SConscript("xaudio2/SCsub");
+    SConscript("xaudio2/SCsub")
 
 # Graphics drivers
-SConscript('gles2/SCsub');
-SConscript('gl_context/SCsub');
+SConscript('gles2/SCsub')
+SConscript('gl_context/SCsub')
 
 # Core dependencies
-SConscript("png/SCsub");
+SConscript("png/SCsub")
 
 # Tools override
 # FIXME: Should likely be integrated in the tools/ codebase
 if (env["tools"] == "yes"):
-    SConscript("convex_decomp/SCsub");
+    SConscript("convex_decomp/SCsub")
 
 if env['vsproj'] == "yes":
     env.AddToVSProject(env.drivers_sources)
diff --git a/drivers/gles2/shaders/SCsub b/drivers/gles2/shaders/SCsub
index 26b6f7f06..bf4ec9485 100644
--- a/drivers/gles2/shaders/SCsub
+++ b/drivers/gles2/shaders/SCsub
@@ -3,10 +3,10 @@
 Import('env')
 
 if env['BUILDERS'].has_key('GLSL120GLES'):
-    env.GLSL120GLES('material.glsl');
-    env.GLSL120GLES('canvas.glsl');
-    env.GLSL120GLES('canvas_shadow.glsl');
-    env.GLSL120GLES('blur.glsl');
-    env.GLSL120GLES('copy.glsl');
+    env.GLSL120GLES('material.glsl')
+    env.GLSL120GLES('canvas.glsl')
+    env.GLSL120GLES('canvas_shadow.glsl')
+    env.GLSL120GLES('blur.glsl')
+    env.GLSL120GLES('copy.glsl')
 
 Export('env')
diff --git a/drivers/png/SCsub b/drivers/png/SCsub
index d3ece6519..aedde3e2b 100644
--- a/drivers/png/SCsub
+++ b/drivers/png/SCsub
@@ -33,7 +33,7 @@ if (env["libpng"] == "builtin"):
     import os
     if ("neon_enabled" in env and env["neon_enabled"]) and os.name != "nt":
         env_png.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"])
-        env_neon = env_png.Clone();
+        env_neon = env_png.Clone()
         if "S_compiler" in env:
             env_neon['CC'] = env['S_compiler']
         neon_sources = []