|  | @@ -351,8 +351,7 @@ def _status_code_and_message(stub):
 | 
	
		
			
				|  |  |          response_type=messages_pb2.COMPRESSABLE,
 | 
	
		
			
				|  |  |          response_size=1,
 | 
	
		
			
				|  |  |          payload=messages_pb2.Payload(body=b'\x00'),
 | 
	
		
			
				|  |  | -        response_status=messages_pb2.EchoStatus(
 | 
	
		
			
				|  |  | -            code=code, message=details))
 | 
	
		
			
				|  |  | +        response_status=messages_pb2.EchoStatus(code=code, message=details))
 | 
	
		
			
				|  |  |      response_future = stub.UnaryCall.future(request)
 | 
	
		
			
				|  |  |      _validate_status_code_and_details(response_future, status, details)
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -363,8 +362,7 @@ def _status_code_and_message(stub):
 | 
	
		
			
				|  |  |              response_type=messages_pb2.COMPRESSABLE,
 | 
	
		
			
				|  |  |              response_parameters=(messages_pb2.ResponseParameters(size=1),),
 | 
	
		
			
				|  |  |              payload=messages_pb2.Payload(body=b'\x00'),
 | 
	
		
			
				|  |  | -            response_status=messages_pb2.EchoStatus(
 | 
	
		
			
				|  |  | -                code=code, message=details))
 | 
	
		
			
				|  |  | +            response_status=messages_pb2.EchoStatus(code=code, message=details))
 | 
	
		
			
				|  |  |          pipe.add(request)  # sends the initial request.
 | 
	
		
			
				|  |  |      # Dropping out of with block closes the pipe
 | 
	
		
			
				|  |  |      _validate_status_code_and_details(response_iterator, status, details)
 | 
	
	
		
			
				|  | @@ -428,8 +426,8 @@ def _compute_engine_creds(stub, args):
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _oauth2_auth_token(stub, args):
 | 
	
		
			
				|  |  | -    json_key_filename = os.environ[oauth2client_client.
 | 
	
		
			
				|  |  | -                                   GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  | +    json_key_filename = os.environ[
 | 
	
		
			
				|  |  | +        oauth2client_client.GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  |      wanted_email = json.load(open(json_key_filename, 'rb'))['client_email']
 | 
	
		
			
				|  |  |      response = _large_unary_common_behavior(stub, True, True, None)
 | 
	
		
			
				|  |  |      if wanted_email != response.username:
 | 
	
	
		
			
				|  | @@ -441,8 +439,8 @@ def _oauth2_auth_token(stub, args):
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _jwt_token_creds(stub, args):
 | 
	
		
			
				|  |  | -    json_key_filename = os.environ[oauth2client_client.
 | 
	
		
			
				|  |  | -                                   GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  | +    json_key_filename = os.environ[
 | 
	
		
			
				|  |  | +        oauth2client_client.GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  |      wanted_email = json.load(open(json_key_filename, 'rb'))['client_email']
 | 
	
		
			
				|  |  |      response = _large_unary_common_behavior(stub, True, False, None)
 | 
	
		
			
				|  |  |      if wanted_email != response.username:
 | 
	
	
		
			
				|  | @@ -451,8 +449,8 @@ def _jwt_token_creds(stub, args):
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  def _per_rpc_creds(stub, args):
 | 
	
		
			
				|  |  | -    json_key_filename = os.environ[oauth2client_client.
 | 
	
		
			
				|  |  | -                                   GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  | +    json_key_filename = os.environ[
 | 
	
		
			
				|  |  | +        oauth2client_client.GOOGLE_APPLICATION_CREDENTIALS]
 | 
	
		
			
				|  |  |      wanted_email = json.load(open(json_key_filename, 'rb'))['client_email']
 | 
	
		
			
				|  |  |      credentials = oauth2client_client.GoogleCredentials.get_application_default()
 | 
	
		
			
				|  |  |      scoped_credentials = credentials.create_scoped([args.oauth_scope])
 |