Remove Python 2 compatibility dependency six (#14202)

* Remove Python 2 compatibility dependency

* Remove Python 2 compatibility dependency six

* Update operators.py

* Remove Python 2 compatibility dependency six

ppocr/data/imaug/operators.py

@@ -20,7 +20,6 @@
 from __future__ import unicode_literals
 
 import sys
-import six
 import cv2
 import numpy as np
 import math
@@ -39,14 +38,7 @@ def __init__(
 
     def __call__(self, data):
         img = data["image"]
-        if six.PY2:
-            assert (
-                type(img) is str and len(img) > 0
-            ), "invalid input 'img' in DecodeImage"
-        else:
-            assert (
-                type(img) is bytes and len(img) > 0
-            ), "invalid input 'img' in DecodeImage"
+        assert type(img) is bytes and len(img) > 0, "invalid input 'img' in DecodeImage"
         img = np.frombuffer(img, dtype="uint8")
         if self.ignore_orientation:
             img = cv2.imdecode(img, cv2.IMREAD_IGNORE_ORIENTATION | cv2.IMREAD_COLOR)

ppocr/data/imaug/randaugment.py

@@ -20,7 +20,6 @@
 from PIL import Image, ImageEnhance, ImageOps
 import numpy as np
 import random
-import six
 
 
 class RawRandAugment(object):
@@ -117,10 +116,7 @@ class RandAugment(RawRandAugment):
 
     def __init__(self, prob=0.5, *args, **kwargs):
         self.prob = prob
-        if six.PY2:
-            super(RandAugment, self).__init__(*args, **kwargs)
-        else:
-            super().__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def __call__(self, data):
         if np.random.rand() > self.prob:
@@ -130,10 +126,7 @@ def __call__(self, data):
             img = np.ascontiguousarray(img)
             img = Image.fromarray(img)
 
-        if six.PY2:
-            img = super(RandAugment, self).__call__(img)
-        else:
-            img = super().__call__(img)
+        img = super().__call__(img)
 
         if isinstance(img, Image.Image):
             img = np.asarray(img)

ppocr/data/imaug/table_ops.py

@@ -20,7 +20,6 @@
 from __future__ import unicode_literals
 
 import sys
-import six
 import cv2
 import numpy as np
 

ppocr/data/lmdb_dataset.py

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import numpy as np
+import io
 import os
 from paddle.io import Dataset
 import lmdb
 import cv2
 import string
-import six
 import pickle
 from PIL import Image
 
@@ -158,7 +158,7 @@ def __len__(self):
 class LMDBDataSetSR(LMDBDataSet):
     def buf2PIL(self, txn, key, type="RGB"):
         imgbuf = txn.get(key)
-        buf = six.BytesIO()
+        buf = io.BytesIO()
         buf.write(imgbuf)
         buf.seek(0)
         im = Image.open(buf).convert(type)

ppocr/utils/save_load.py

@@ -19,7 +19,6 @@
 import errno
 import os
 import pickle
-import six
 import json
 
 import paddle
@@ -69,9 +68,7 @@ def load_model(config, model, optimizer=None, model_type="det"):
         if checkpoints:
             if os.path.exists(os.path.join(checkpoints, "metric.states")):
                 with open(os.path.join(checkpoints, "metric.states"), "rb") as f:
-                    states_dict = (
-                        pickle.load(f) if six.PY2 else pickle.load(f, encoding="latin1")
-                    )
+                    states_dict = pickle.load(f, encoding="latin1")
                 best_model_dict = states_dict.get("best_model_dict", {})
                 if "epoch" in states_dict:
                     best_model_dict["start_epoch"] = states_dict["epoch"] + 1
@@ -140,9 +137,7 @@ def load_model(config, model, optimizer=None, model_type="det"):
 
         if os.path.exists(checkpoints + ".states"):
             with open(checkpoints + ".states", "rb") as f:
-                states_dict = (
-                    pickle.load(f) if six.PY2 else pickle.load(f, encoding="latin1")
-                )
+                states_dict = pickle.load(f, encoding="latin1")
             best_model_dict = states_dict.get("best_model_dict", {})
             best_model_dict["acc"] = 0.0
             if "epoch" in states_dict:

pyproject.toml

@@ -41,7 +41,6 @@ classifiers = [
 dependencies = [
     "shapely",
     "scikit-image",
-    "six",
     "pyclipper",
     "lmdb",
     "tqdm",

requirements.txt

@@ -1,6 +1,5 @@
 shapely
 scikit-image
-six
 pyclipper
 lmdb
 tqdm

test_tipc/supplementary/data.py

@@ -44,14 +44,7 @@ def __init__(self, img_mode="RGB", channel_first=False, **kwargs):
 
     def __call__(self, data):
         img = data["image"]
-        if six.PY2:
-            assert (
-                type(img) is str and len(img) > 0
-            ), "invalid input 'img' in DecodeImage"
-        else:
-            assert (
-                type(img) is bytes and len(img) > 0
-            ), "invalid input 'img' in DecodeImage"
+        assert type(img) is bytes and len(img) > 0, "invalid input 'img' in DecodeImage"
         img = np.frombuffer(img, dtype="uint8")
         img = cv2.imdecode(img, 1)
         if img is None:

test_tipc/supplementary/utils.py

@@ -132,9 +132,7 @@ def load_model(config, model, optimizer=None):
 
         if os.path.exists(checkpoints + ".states"):
             with open(checkpoints + ".states", "rb") as f:
-                states_dict = (
-                    pickle.load(f) if six.PY2 else pickle.load(f, encoding="latin1")
-                )
+                states_dict = pickle.load(f, encoding="latin1")
             best_model_dict = states_dict.get("best_model_dict", {})
             if "epoch" in states_dict:
                 best_model_dict["start_epoch"] = states_dict["epoch"] + 1