diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-23 14:57:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-23 14:57:52 -0700 |
| commit | 995bc78441cbd58fe026644265c204d2a2a7551b (patch) | |
| tree | dfa81e4a49ab5b77c0313c9acc6b09a260aafb43 /src/python/grpcio/tests/unit/test_common.py | |
| parent | e5b19fe84f0c4b473872632553b3cf5b21e82e60 (diff) | |
| parent | 634e67617b3b445185b5485f493b591b53b35d9d (diff) | |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'src/python/grpcio/tests/unit/test_common.py')
| -rw-r--r-- | src/python/grpcio/tests/unit/test_common.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/python/grpcio/tests/unit/test_common.py b/src/python/grpcio/tests/unit/test_common.py index 29431bfb9d..824f1cbd16 100644 --- a/src/python/grpcio/tests/unit/test_common.py +++ b/src/python/grpcio/tests/unit/test_common.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -31,6 +31,8 @@ import collections +import six + INVOCATION_INITIAL_METADATA = ((b'0', b'abc'), (b'1', b'def'), (b'2', b'ghi'),) SERVICE_INITIAL_METADATA = ((b'3', b'jkl'), (b'4', b'mno'), (b'5', b'pqr'),) SERVICE_TERMINAL_METADATA = ((b'6', b'stu'), (b'7', b'vwx'), (b'8', b'yza'),) @@ -65,7 +67,7 @@ def metadata_transmitted(original_metadata, transmitted_metadata): key, value = tuple(key_value_pair) transmitted[key].append(value) - for key, values in original.iteritems(): + for key, values in six.iteritems(original): transmitted_values = transmitted[key] transmitted_iterator = iter(transmitted_values) try: |