From b291f186be78dc8bd8c31b301fb8795a106b3ff4 Mon Sep 17 00:00:00 2001
From: Mehrdad Afshari <mmx@google.com>
Date: Thu, 14 Jun 2018 13:57:50 -0700
Subject: [PATCH] Refactor: reorder

---
 src/python/grpcio/grpc/_interceptor.py | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/python/grpcio/grpc/_interceptor.py b/src/python/grpcio/grpc/_interceptor.py
index 30c98add108..1d2d374ad19 100644
--- a/src/python/grpcio/grpc/_interceptor.py
+++ b/src/python/grpcio/grpc/_interceptor.py
@@ -201,13 +201,6 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
             credentials=credentials)
         return response
 
-    def with_call(self, request, timeout=None, metadata=None, credentials=None):
-        return self._with_call(
-            request,
-            timeout=timeout,
-            metadata=metadata,
-            credentials=credentials)
-
     def _with_call(self, request, timeout=None, metadata=None,
                    credentials=None):
         client_call_details = _ClientCallDetails(self._method, timeout,
@@ -232,6 +225,13 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
             continuation, client_call_details, request)
         return call.result(), call
 
+    def with_call(self, request, timeout=None, metadata=None, credentials=None):
+        return self._with_call(
+            request,
+            timeout=timeout,
+            metadata=metadata,
+            credentials=credentials)
+
     def future(self, request, timeout=None, metadata=None, credentials=None):
         client_call_details = _ClientCallDetails(self._method, timeout,
                                                  metadata, credentials)
@@ -298,17 +298,6 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
             credentials=credentials)
         return response
 
-    def with_call(self,
-                  request_iterator,
-                  timeout=None,
-                  metadata=None,
-                  credentials=None):
-        return self._with_call(
-            request_iterator,
-            timeout=timeout,
-            metadata=metadata,
-            credentials=credentials)
-
     def _with_call(self,
                    request_iterator,
                    timeout=None,
@@ -336,6 +325,17 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
             continuation, client_call_details, request_iterator)
         return call.result(), call
 
+    def with_call(self,
+                  request_iterator,
+                  timeout=None,
+                  metadata=None,
+                  credentials=None):
+        return self._with_call(
+            request_iterator,
+            timeout=timeout,
+            metadata=metadata,
+            credentials=credentials)
+
     def future(self,
                request_iterator,
                timeout=None,