Del six.PY code2 (#33607)

* del py2 code2

* fix test timeout

Author: tianshuo78520a

python/paddle/compat.py

@@ -17,12 +17,8 @@
 
 __all__ = []
 
-if six.PY2:
-    int_type = int
-    long_type = long  # noqa: F821
-else:
-    int_type = int
-    long_type = int
+int_type = int
+long_type = int
 
 
 #  str and bytes related functions
@@ -262,7 +258,4 @@ def get_exception_message(exc):
     """
     assert exc is not None
 
-    if six.PY2:
-        return exc.message
-    else:
-        return str(exc)
+    return str(exc)

python/paddle/dataset/cifar.py

@@ -62,11 +62,7 @@ def reader():
                          if sub_name in each_item.name)
 
                 for name in names:
-                    if six.PY2:
-                        batch = pickle.load(f.extractfile(name))
-                    else:
-                        batch = pickle.load(
-                            f.extractfile(name), encoding='bytes')
+                    batch = pickle.load(f.extractfile(name), encoding='bytes')
                     for item in read_batch(batch):
                         yield item
 

python/paddle/dataset/common.py

@@ -101,8 +101,6 @@ def download(url, module_name, md5sum, save_name=None):
                     bar = paddle.hapi.progressbar.ProgressBar(
                         total_iter, name='item')
                     for data in r.iter_content(chunk_size=chunk_size):
-                        if six.PY2:
-                            data = six.b(data)
                         f.write(data)
                         log_index += 1
                         bar.update(log_index, {})

python/paddle/dataset/flowers.py

@@ -132,10 +132,7 @@ def reader():
                     file = file.strip()
                     batch = None
                     with open(file, 'rb') as f:
-                        if six.PY2:
-                            batch = pickle.load(f)
-                        else:
-                            batch = pickle.load(f, encoding='bytes')
+                        batch = pickle.load(f, encoding='bytes')
 
                         if six.PY3:
                             batch = cpt.to_text(batch)

python/paddle/distributed/fleet/utils/http_server.py

@@ -17,12 +17,8 @@
 
 import six
 # NOTE: HTTPServer has a different name in python2 and python3
-if six.PY2:
-    from BaseHTTPServer import HTTPServer
-    import SimpleHTTPServer
-else:
-    from http.server import HTTPServer
-    import http.server as SimpleHTTPServer
+from http.server import HTTPServer
+import http.server as SimpleHTTPServer
 
 import time
 import threading

python/paddle/fluid/contrib/slim/tests/quant2_int8_image_classification_comparison.py

@@ -226,10 +226,7 @@ def _predict(self,
                 if iters == skip_batch_num:
                     total_samples = 0
                     infer_start_time = time.time()
-                if six.PY2:
-                    images = map(lambda x: x[0].reshape(dshape), data)
-                if six.PY3:
-                    images = list(map(lambda x: x[0].reshape(dshape), data))
+                images = list(map(lambda x: x[0].reshape(dshape), data))
                 images = np.array(images).astype('float32')
                 labels = np.array([x[1] for x in data]).astype('int64')
 

python/paddle/fluid/contrib/slim/tests/quant_int8_image_classification_comparison.py

@@ -196,10 +196,7 @@ def _predict(self,
                 if iters == skip_batch_num:
                     total_samples = 0
                     infer_start_time = time.time()
-                if six.PY2:
-                    images = map(lambda x: x[0].reshape(dshape), data)
-                if six.PY3:
-                    images = list(map(lambda x: x[0].reshape(dshape), data))
+                images = list(map(lambda x: x[0].reshape(dshape), data))
                 images = np.array(images).astype('float32')
                 labels = np.array([x[1] for x in data]).astype('int64')
 

python/paddle/fluid/dataloader/dataloader_iter.py

@@ -27,10 +27,7 @@
 from paddle.fluid.framework import _set_expected_place, _current_expected_place
 
 # NOTE: queue has a different name in python2 and python3
-if six.PY2:
-    import Queue as queue
-else:
-    import queue
+import queue
 
 import paddle
 from .. import core, layers

python/paddle/fluid/dataloader/worker.py

@@ -26,10 +26,7 @@
 from .flat import _flatten_batch
 
 # NOTE: queue has a different name in python2 and python3
-if six.PY2:
-    import Queue as queue
-else:
-    import queue
+import queue
 
 __all__ = ['get_worker_info']
 

python/paddle/fluid/dygraph/checkpoint.py

@@ -19,7 +19,6 @@
 import functools
 from ..framework import Variable, default_main_program, in_dygraph_mode, dygraph_only, Parameter, ParamBase, _varbase_creator, _dygraph_tracer
 import pickle
-import six
 from . import learning_rate_scheduler
 import warnings
 from .. import core
@@ -194,16 +193,14 @@ def load_dygraph(model_path, **configs):
         para_dict = {}
         if os.path.exists(params_file_path):
             with open(params_file_path, 'rb') as f:
-                para_dict = pickle.load(f) if six.PY2 else pickle.load(
-                    f, encoding='latin1')
+                para_dict = pickle.load(f, encoding='latin1')
 
         if not config.keep_name_table and "StructuredToParameterName@@" in para_dict:
             del para_dict["StructuredToParameterName@@"]
 
         if os.path.exists(opti_file_path):
             with open(opti_file_path, 'rb') as f:
-                opti_dict = pickle.load(f) if six.PY2 else pickle.load(
-                    f, encoding='latin1')
+                opti_dict = pickle.load(f, encoding='latin1')
     else:
         # check model path
         if not os.path.isdir(model_prefix):