From 7611a29ae6b8925f3f602ccc387c8543feb52116 Mon Sep 17 00:00:00 2001
From: Karl Kroening <karlk@kralnet.us>
Date: Fri, 5 Jul 2019 19:50:57 -0500
Subject: [PATCH] Drop `builtins` import

---
 ffmpeg/_run.py              | 1 -
 ffmpeg/_utils.py            | 7 +------
 ffmpeg/_view.py             | 2 --
 ffmpeg/dag.py               | 2 --
 ffmpeg/nodes.py             | 1 -
 ffmpeg/tests/test_ffmpeg.py | 7 +------
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py
index afc504d..aaa92fd 100644
--- a/ffmpeg/_run.py
+++ b/ffmpeg/_run.py
@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 from .dag import get_outgoing_edges, topo_sort
 from ._utils import basestring, convert_kwargs_to_cmd_line_args
-from builtins import str
 from functools import reduce
 import collections
 import copy
diff --git a/ffmpeg/_utils.py b/ffmpeg/_utils.py
index 10d0c36..1f61d4e 100644
--- a/ffmpeg/_utils.py
+++ b/ffmpeg/_utils.py
@@ -1,5 +1,4 @@
 from __future__ import unicode_literals
-from builtins import str
 import hashlib
 import sys
 
@@ -33,14 +32,10 @@ def with_metaclass(meta, *bases):
 
 
 if sys.version_info.major >= 3:
-
     class basestring(with_metaclass(BaseBaseString)):
         pass
-
-
 else:
-    # noinspection PyUnresolvedReferences,PyCompatibility
-    from builtins import basestring
+    basestring = basestring
 
 
 def _recursive_repr(item):
diff --git a/ffmpeg/_view.py b/ffmpeg/_view.py
index fb129fa..2b8b0eb 100644
--- a/ffmpeg/_view.py
+++ b/ffmpeg/_view.py
@@ -1,6 +1,4 @@
 from __future__ import unicode_literals
-
-from builtins import str
 from .dag import get_outgoing_edges
 from ._run import topo_sort
 import tempfile
diff --git a/ffmpeg/dag.py b/ffmpeg/dag.py
index 9564d7f..02ce83f 100644
--- a/ffmpeg/dag.py
+++ b/ffmpeg/dag.py
@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
-
 from ._utils import get_hash, get_hash_int
-from builtins import object
 from collections import namedtuple
 
 
diff --git a/ffmpeg/nodes.py b/ffmpeg/nodes.py
index f4b8f7f..e4150c2 100644
--- a/ffmpeg/nodes.py
+++ b/ffmpeg/nodes.py
@@ -3,7 +3,6 @@ from .dag import KwargReprNode
 from ._utils import basestring
 from ._utils import escape_chars
 from ._utils import get_hash_int
-from builtins import object
 import os
 
 
diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py
index 279a323..c32b89e 100644
--- a/ffmpeg/tests/test_ffmpeg.py
+++ b/ffmpeg/tests/test_ffmpeg.py
@@ -1,7 +1,4 @@
 from __future__ import unicode_literals
-from builtins import bytes
-from builtins import range
-from builtins import str
 import ffmpeg
 import os
 import pytest
@@ -689,9 +686,7 @@ def test_pipe():
         cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
     )
 
-    in_data = bytes(
-        bytearray([random.randint(0, 255) for _ in range(frame_size * frame_count)])
-    )
+    in_data = bytearray([random.randint(0, 255) for _ in range(frame_size * frame_count)])
     p.stdin.write(in_data)  # note: this could block, in which case need to use threads
     p.stdin.close()