[beam] branch master updated: Remove encoding= from the json.loads call.

[pabloem]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new aad27ff  Remove encoding= from the json.loads call.
     new dbc4534  Merge pull request #15598 from [BEAM-12000] Remove encoding= 
from the json.loads call.
aad27ff is described below

commit aad27ff13b0dae8e67bae68d570d2ba0c78dd33d
Author: Yilei "Dolee" Yang <yileiy...@google.com>
AuthorDate: Mon Sep 27 12:12:16 2021 -0700

    Remove encoding= from the json.loads call.
    
    The encoding= parameter has been deprecated and ignored since Python 3.1, 
and is removed in Python 3.9.
    
    See https://docs.python.org/3/whatsnew/3.9.html#removed
---
 sdks/python/apache_beam/runners/dataflow/internal/apiclient.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py 
b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
index c60e88e..fd5b001 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
@@ -405,7 +405,7 @@ class Job(object):
     # further modify it to not output too-long strings, aimed at the
     # 10,000+ character hex-encoded "serialized_fn" values.
     return json.dumps(
-        json.loads(encoding.MessageToJson(self.proto), 
encoding='shortstrings'),
+        json.loads(encoding.MessageToJson(self.proto)),
         indent=2,
         sort_keys=True)