@@ -355,7 +355,7 @@ def WriteCollapsedDependencies(self, name, targets, order_only=None):
355
355
356
356
Uses a stamp file if necessary."""
357
357
358
- assert targets == filter ( None , targets ) , targets
358
+ assert targets == [ item for item in targets if item ] , targets
359
359
if len (targets ) == 0 :
360
360
assert not order_only
361
361
return None
@@ -432,8 +432,8 @@ def WriteSpec(self, spec, config_name, generator_flags):
432
432
compile_depends .append (target .PreCompileInput ())
433
433
if target .uses_cpp :
434
434
self .target .uses_cpp = True
435
- actions_depends = filter ( None , actions_depends )
436
- compile_depends = filter ( None , compile_depends )
435
+ actions_depends = [ item for item in actions_depends if item ]
436
+ compile_depends = [ item for item in compile_depends if item ]
437
437
actions_depends = self .WriteCollapsedDependencies ('actions_depends' ,
438
438
actions_depends )
439
439
compile_depends = self .WriteCollapsedDependencies ('compile_depends' ,
@@ -2381,6 +2381,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
2381
2381
2382
2382
qualified_target_for_hash = gyp .common .QualifiedTarget (build_file , name ,
2383
2383
toolset )
2384
+ qualified_target_for_hash = qualified_target_for_hash .encode ('utf-8' )
2384
2385
hash_for_rules = hashlib .md5 (qualified_target_for_hash ).hexdigest ()
2385
2386
2386
2387
base_path = os .path .dirname (build_file )
0 commit comments