From 8b1f332de5be820c61cd2b4f83d02c459ed52000 Mon Sep 17 00:00:00 2001
From: Dmitriy Sokolov <silentsokolov@gmail.com>
Date: Wed, 19 Oct 2022 20:35:10 +0300
Subject: [PATCH] Remove python 2.7

---
 .github/workflows/build.yml          | 23 +++++++++--------------
 flask_thumbnails/__init__.py         |  4 ----
 flask_thumbnails/storage_backends.py |  4 ----
 flask_thumbnails/thumbnail.py        |  4 ----
 flask_thumbnails/utils.py            | 15 ++-------------
 tests/core_tests.py                  |  4 ----
 tests/storage_backends_tests.py      |  4 ----
 tests/utils_tests.py                 |  4 ----
 8 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6003058..d5e3805 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,11 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: 2.7
-            flask-version: "0.10.*"
-          - python-version: 2.7
-            flask-version: "0.11.*"
-
           - python-version: 3.6
             flask-version: "0.12.*"
           - python-version: 3.6
@@ -29,25 +24,25 @@ jobs:
             flask-version: "2.0.*"
 
           - python-version: 3.7
-            flask-version: "1.0.*"
+            flask-version: "2.0.*"
           - python-version: 3.7
-            flask-version: "1.1.*"
+            flask-version: "2.1.*"
           - python-version: 3.7
-            flask-version: "2.0.*"
+            flask-version: "2.2.*"
 
           - python-version: 3.8
-            flask-version: "1.0.*"
+            flask-version: "2.0.*"
           - python-version: 3.8
-            flask-version: "1.1.*"
+            flask-version: "2.1.*"
           - python-version: 3.8
-            flask-version: "2.0.*"
+            flask-version: "2.2.*"
 
           - python-version: 3.9
-            flask-version: "1.0.*"
+            flask-version: "2.0.*"
           - python-version: 3.9
-            flask-version: "1.1.*"
+            flask-version: "2.1.*"
           - python-version: 3.9
-            flask-version: "2.0.*"
+            flask-version: "2.2.*"
             coverage: true
 
     steps:
diff --git a/flask_thumbnails/__init__.py b/flask_thumbnails/__init__.py
index 7000c9d..46c6b53 100644
--- a/flask_thumbnails/__init__.py
+++ b/flask_thumbnails/__init__.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 __author__ = "Dmitriy Sokolov"
 __version__ = "1.1.0"
 
diff --git a/flask_thumbnails/storage_backends.py b/flask_thumbnails/storage_backends.py
index 4b4e370..16982e1 100644
--- a/flask_thumbnails/storage_backends.py
+++ b/flask_thumbnails/storage_backends.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import errno
 import os
 
diff --git a/flask_thumbnails/thumbnail.py b/flask_thumbnails/thumbnail.py
index 2697202..550d378 100644
--- a/flask_thumbnails/thumbnail.py
+++ b/flask_thumbnails/thumbnail.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 from io import BytesIO
 
diff --git a/flask_thumbnails/utils.py b/flask_thumbnails/utils.py
index b6c59aa..f33cbbb 100644
--- a/flask_thumbnails/utils.py
+++ b/flask_thumbnails/utils.py
@@ -1,10 +1,5 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import importlib
 import os
-import sys
 
 
 def import_from_string(path):
@@ -30,10 +25,7 @@ def generate_filename(original_filename, *options):
 
 
 def parse_size(size):
-    if sys.version_info < (3,):
-        integer_types = (int,)
-    else:
-        integer_types = (int,)
+    integer_types = (int,)
 
     if isinstance(size, integer_types):
         # If the size parameter is a single number, assume square aspect.
@@ -60,10 +52,7 @@ def parse_size(size):
 
 
 def aspect_to_string(size):
-    if sys.version_info < (3,):
-        str_type = basestring  # pylint: disable=undefined-variable
-    else:
-        str_type = str
+    str_type = str
 
     if isinstance(size, str_type):
         return size
diff --git a/tests/core_tests.py b/tests/core_tests.py
index c2de829..f99951a 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 import tempfile
 import unittest
diff --git a/tests/storage_backends_tests.py b/tests/storage_backends_tests.py
index c2e86c4..2c65da0 100644
--- a/tests/storage_backends_tests.py
+++ b/tests/storage_backends_tests.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import os
 import shutil
 import tempfile
diff --git a/tests/utils_tests.py b/tests/utils_tests.py
index 2ea9924..1a51da1 100644
--- a/tests/utils_tests.py
+++ b/tests/utils_tests.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-
 import unittest
 
 from flask_thumbnails.utils import (