aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-23 14:57:52 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-23 14:57:52 -0700
commit995bc78441cbd58fe026644265c204d2a2a7551b (patch)
treedfa81e4a49ab5b77c0313c9acc6b09a260aafb43 /src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
parente5b19fe84f0c4b473872632553b3cf5b21e82e60 (diff)
parent634e67617b3b445185b5485f493b591b53b35d9d (diff)
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py')
-rw-r--r--src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py b/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
index efc990421a..881633754c 100644
--- a/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.py
+++ b/src/python/grpcio/tests/unit/_core_over_links_base_interface_test.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
@@ -35,6 +35,8 @@ import random
import time
import unittest
+import six
+
from grpc._adapter import _intermediary_low
from grpc._links import invocation
from grpc._links import service
@@ -68,7 +70,7 @@ def _serialization_behaviors_from_serializations(serializations):
request_deserializers = {}
response_serializers = {}
response_deserializers = {}
- for (group, method), serialization in serializations.iteritems():
+ for (group, method), serialization in six.iteritems(serializations):
request_serializers[group, method] = serialization.serialize_request
request_deserializers[group, method] = serialization.deserialize_request
response_serializers[group, method] = serialization.serialize_response