Update web-platform-tests to revision ddfc95cf0493ae147a4f6a4d7be8eff1a0c23098

tests/wpt/web-platform-tests/tools/manifest/manifest.py

@@ -2,7 +2,7 @@ import json
 import os
 import re
 from collections import defaultdict
-from six import iteritems, itervalues, viewkeys
+from six import iteritems, itervalues, viewkeys, string_types
 
 from .item import ManualTest, WebdriverSpecTest, Stub, RefTestNode, RefTest, TestharnessTest, SupportFile, ConformanceCheckerTest, VisualTest
 from .log import get_logger
@@ -20,14 +20,6 @@ class ManifestVersionMismatch(ManifestError):
     pass
 
 
-def sourcefile_items(args):
-    tests_root, url_base, rel_path, status = args
-    source_file = SourceFile(tests_root,
-                             rel_path,
-                             url_base)
-    return rel_path, source_file.manifest_items()
-
-
 class Manifest(object):
     def __init__(self, url_base="/"):
         assert url_base is not None
@@ -221,7 +213,7 @@ def load(tests_root, manifest):
     logger = get_logger()
 
     # "manifest" is a path or file-like object.
-    if isinstance(manifest, basestring):
+    if isinstance(manifest, string_types):
         if os.path.exists(manifest):
             logger.debug("Opening manifest at %s" % manifest)
         else: