Skip to content

Commit

Permalink
Expand set of allowed types when updating manifest. (#17172)
Browse files Browse the repository at this point in the history
  • Loading branch information
jdm authored and gsnedders committed Jun 4, 2019
1 parent b48edf7 commit 53706a9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/manifest/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
import os
from collections import MutableMapping, defaultdict
from six import iteritems, iterkeys, itervalues, string_types
from six import iteritems, iterkeys, itervalues, string_types, binary_type, text_type

from . import vcs
from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode, Stub,
Expand Down Expand Up @@ -323,7 +323,7 @@ def update(self, tree):

for source_file, update in tree:
if not update:
assert isinstance(source_file, (bytes, str))
assert isinstance(source_file, (binary_type, text_type))
rel_path = source_file # type: Text
seen_files.add(rel_path)
assert rel_path in path_hash
Expand Down

0 comments on commit 53706a9

Please sign in to comment.