From da0022e40393783c5ee48627e62be04f21bb9e1b Mon Sep 17 00:00:00 2001
From: Matsumoto Ruko <38883252+gsq7474741@users.noreply.github.com>
Date: Thu, 1 Dec 2022 10:59:09 +0800
Subject: [PATCH] [CodeStyle][py36] remove sys.version branch for py36 (#48540)

---
 .../fleet/data_generator/data_generator.py       |  4 ++--
 python/paddle/distributed/metric/metrics.py      |  7 ++-----
 tools/dockerfile/build_scripts/ssl-check.py      | 16 ++++------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/python/paddle/distributed/fleet/data_generator/data_generator.py b/python/paddle/distributed/fleet/data_generator/data_generator.py
index 297a2cf003..64f8e377b9 100644
--- a/python/paddle/distributed/fleet/data_generator/data_generator.py
+++ b/python/paddle/distributed/fleet/data_generator/data_generator.py
@@ -262,7 +262,7 @@ class MultiSlotStringDataGenerator(DataGenerator):
         Returns:
             Return a string data that can be read directly by the MultiSlotDataFeed.
         '''
-        if sys.version > '3' and isinstance(line, zip):
+        if isinstance(line, zip):
             line = list(line)
 
         if not isinstance(line, list) and not isinstance(line, tuple):
@@ -311,7 +311,7 @@ class MultiSlotDataGenerator(DataGenerator):
         Returns:
             Return a string data that can be read directly by the MultiSlotDataFeed.
         '''
-        if sys.version > '3' and isinstance(line, zip):
+        if isinstance(line, zip):
             line = list(line)
 
         if not isinstance(line, list) and not isinstance(line, tuple):
diff --git a/python/paddle/distributed/metric/metrics.py b/python/paddle/distributed/metric/metrics.py
index 306590b92d..5aea93bc8b 100644
--- a/python/paddle/distributed/metric/metrics.py
+++ b/python/paddle/distributed/metric/metrics.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import logging
-import sys
 
 import yaml
 
@@ -36,10 +35,8 @@ def init_metric(
     bucket_size=1000000,
 ):
     yaml_fobj = open(metric_yaml_path)
-    if sys.version.startswith('2.7.13'):
-        content = yaml.load(yaml_fobj)
-    else:
-        content = yaml.load(yaml_fobj, Loader=yaml.FullLoader)
+
+    content = yaml.load(yaml_fobj, Loader=yaml.FullLoader)
 
     print("yaml metric config: \n")
     print(content)
diff --git a/tools/dockerfile/build_scripts/ssl-check.py b/tools/dockerfile/build_scripts/ssl-check.py
index 6c0f07330e..aaf21c70f0 100644
--- a/tools/dockerfile/build_scripts/ssl-check.py
+++ b/tools/dockerfile/build_scripts/ssl-check.py
@@ -14,22 +14,14 @@
 
 # cf. https://github.com/pypa/manylinux/issues/53
 
+import sys
+from urllib.request import urlopen
+
 GOOD_SSL = "https://google.com"
 BAD_SSL = "https://self-signed.badssl.com"
 
-import sys
-
 print("Testing SSL certificate checking for Python:", sys.version)
 
-if sys.version_info[0] >= 3:
-    from urllib.request import urlopen
-
-    EXC = OSError
-else:
-    from urllib import urlopen
-
-    EXC = IOError
-
 print("Connecting to %s should work" % (GOOD_SSL,))
 urlopen(GOOD_SSL)
 print("...it did, yay.")
@@ -40,5 +32,5 @@ try:
     # If we get here then we failed:
     print("...it DIDN'T!!!!!11!!1one!")
     sys.exit(1)
-except EXC:
+except OSError:
     print("...it did, yay.")
-- 
GitLab