diff --git a/tools/gyp/pylib/gyp/common_test.py b/tools/gyp/pylib/gyp/common_test.py
index ad6f9a1438f30f..b75bbb8412b6f8 100755
--- a/tools/gyp/pylib/gyp/common_test.py
+++ b/tools/gyp/pylib/gyp/common_test.py
@@ -59,10 +59,10 @@ def test_platform_default(self):
     self.assertFlavor('freebsd', 'freebsd9' , {})
     self.assertFlavor('freebsd', 'freebsd10', {})
     self.assertFlavor('openbsd', 'openbsd5' , {})
-    self.assertFlavor('solaris', 'sunos5'   , {});
-    self.assertFlavor('solaris', 'sunos'    , {});
-    self.assertFlavor('linux'  , 'linux2'   , {});
-    self.assertFlavor('linux'  , 'linux3'   , {});
+    self.assertFlavor('solaris', 'sunos5'   , {})
+    self.assertFlavor('solaris', 'sunos'    , {})
+    self.assertFlavor('linux'  , 'linux2'   , {})
+    self.assertFlavor('linux'  , 'linux3'   , {})
 
   def test_param(self):
     self.assertFlavor('foobar', 'linux2' , {'flavor': 'foobar'})
diff --git a/tools/gyp/pylib/gyp/generator/analyzer.py b/tools/gyp/pylib/gyp/generator/analyzer.py
index dc17c96524fddb..88d6c72d7ada61 100644
--- a/tools/gyp/pylib/gyp/generator/analyzer.py
+++ b/tools/gyp/pylib/gyp/generator/analyzer.py
@@ -615,7 +615,7 @@ def _supplied_target_names(self):
 
   def _supplied_target_names_no_all(self):
     """Returns the supplied test targets without 'all'."""
-    result = self._supplied_target_names();
+    result = self._supplied_target_names()
     result.discard('all')
     return result
 
@@ -668,7 +668,7 @@ def find_matching_test_target_names(self):
 
   def find_matching_compile_target_names(self):
     """Returns the set of output compile targets."""
-    assert self.is_build_impacted();
+    assert self.is_build_impacted()
     # Compile targets are found by searching up from changed targets.
     # Reset the visited status for _GetBuildTargets.
     for target in self._name_to_target.itervalues():
diff --git a/tools/gyp/pylib/gyp/generator/cmake.py b/tools/gyp/pylib/gyp/generator/cmake.py
index 74b0c715e3b89a..149268711b8b9b 100644
--- a/tools/gyp/pylib/gyp/generator/cmake.py
+++ b/tools/gyp/pylib/gyp/generator/cmake.py
@@ -686,7 +686,7 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
   for src in srcs:
     _, ext = os.path.splitext(src)
     src_type = COMPILABLE_EXTENSIONS.get(ext, None)
-    src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src);
+    src_norm_path = NormjoinPath(path_from_cmakelists_to_gyp, src)
 
     if src_type == 's':
       s_sources.append(src_norm_path)
diff --git a/tools/gyp/pylib/gyp/generator/xcode.py b/tools/gyp/pylib/gyp/generator/xcode.py
index 8d65e53cca82db..9242324196d2d3 100644
--- a/tools/gyp/pylib/gyp/generator/xcode.py
+++ b/tools/gyp/pylib/gyp/generator/xcode.py
@@ -248,7 +248,7 @@ def Finalize1(self, xcode_targets, serialize_all_tests):
         targets_for_all.append(xcode_target)
 
       if target_name.lower() == 'all':
-        has_custom_all = True;
+        has_custom_all = True
 
       # If this target has a 'run_as' attribute, add its target to the
       # targets, and add it to the test targets.
@@ -639,7 +639,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
     pbxp = xcp.project
 
     # Set project-level attributes from multiple options
-    project_attributes = {};
+    project_attributes = {}
     if parallel_builds:
       project_attributes['BuildIndependentTargetsInParallel'] = 'YES'
     if upgrade_check_project_version:
@@ -788,7 +788,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
     # logic all happens in ninja.  Don't bother creating the extra targets in
     # that case.
     if type != 'none' and (spec_actions or spec_rules) and not ninja_wrapper:
-      support_xccl = CreateXCConfigurationList(configuration_names);
+      support_xccl = CreateXCConfigurationList(configuration_names)
       support_target_suffix = generator_flags.get(
           'support_target_suffix', ' Support')
       support_target_properties = {
@@ -1183,7 +1183,7 @@ def GenerateOutput(target_list, target_dicts, data, params):
         dest = '$(SRCROOT)/' + dest
 
       code_sign = int(copy_group.get('xcode_code_sign', 0))
-      settings = (None, '{ATTRIBUTES = (CodeSignOnCopy, ); }')[code_sign];
+      settings = (None, '{ATTRIBUTES = (CodeSignOnCopy, ); }')[code_sign]
 
       # Coalesce multiple "copies" sections in the same target with the same
       # "destination" property into the same PBXCopyFilesBuildPhase, otherwise
diff --git a/tools/gyp/pylib/gyp/mac_tool.py b/tools/gyp/pylib/gyp/mac_tool.py
index ec22d260d1580a..409c7fedbd2368 100755
--- a/tools/gyp/pylib/gyp/mac_tool.py
+++ b/tools/gyp/pylib/gyp/mac_tool.py
@@ -285,7 +285,7 @@ def ExecFilterLibtool(self, *cmd_list):
   def ExecPackageIosFramework(self, framework):
     # Find the name of the binary based on the part before the ".framework".
     binary = os.path.basename(framework).split('.')[0]
-    module_path = os.path.join(framework, 'Modules');
+    module_path = os.path.join(framework, 'Modules')
     if not os.path.exists(module_path):
       os.mkdir(module_path)
     module_template = 'framework module %s {\n' \
@@ -346,7 +346,7 @@ def ExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers):
     WriteHmap(out, filelist)
 
   def ExecCopyIosFrameworkHeaders(self, framework, *copy_headers):
-    header_path = os.path.join(framework, 'Headers');
+    header_path = os.path.join(framework, 'Headers')
     if not os.path.exists(header_path):
       os.makedirs(header_path)
     for header in copy_headers:
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
index b083984677faff..25a928b3e62df9 100644
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
@@ -1076,7 +1076,7 @@ def _GetIOSPostbuilds(self, configname, output_binary):
     # Xcode expects XCTests to be copied into the TEST_HOST dir.
     if self._IsXCTest():
       source = os.path.join("${BUILT_PRODUCTS_DIR}", product_name)
-      test_host = os.path.dirname(settings.get('TEST_HOST'));
+      test_host = os.path.dirname(settings.get('TEST_HOST'))
       xctest_destination = os.path.join(test_host, 'PlugIns', product_name)
       postbuilds.extend(['ditto %s %s' % (source, xctest_destination)])
 
@@ -1093,7 +1093,7 @@ def _GetIOSPostbuilds(self, configname, output_binary):
 
     if self._IsXCTest():
       # For device xctests, Xcode copies two extra frameworks into $TEST_HOST.
-      test_host = os.path.dirname(settings.get('TEST_HOST'));
+      test_host = os.path.dirname(settings.get('TEST_HOST'))
       frameworks_dir = os.path.join(test_host, 'Frameworks')
       platform_root = self._XcodePlatformPath(configname)
       frameworks = \
diff --git a/tools/gyp/pylib/gyp/xcodeproj_file.py b/tools/gyp/pylib/gyp/xcodeproj_file.py
index 021ed4309db298..0534f51fe5cf8d 100644
--- a/tools/gyp/pylib/gyp/xcodeproj_file.py
+++ b/tools/gyp/pylib/gyp/xcodeproj_file.py
@@ -1994,7 +1994,7 @@ def SetDestination(self, path):
 
     path_tree_match = self.path_tree_re.search(path)
     if path_tree_match:
-      path_tree = path_tree_match.group(1);
+      path_tree = path_tree_match.group(1)
       if path_tree in self.path_tree_first_to_subfolder:
         subfolder = self.path_tree_first_to_subfolder[path_tree]
         relative_path = path_tree_match.group(3)
@@ -2047,7 +2047,7 @@ def SetDestination(self, path):
             # subfolder = 16 from above
             # The second element of the path is an unrecognized variable.
             # Include it and any remaining elements in relative_path.
-            relative_path = path_tree_match.group(3);
+            relative_path = path_tree_match.group(3)
 
       else:
         # The path starts with an unrecognized Xcode variable