From 8178997e2838d01dafe14dcf0a1d2d6c6a20f051 Mon Sep 17 00:00:00 2001
From: Chayim <chayim@users.noreply.github.com>
Date: Thu, 28 Oct 2021 12:46:04 +0300
Subject: Adding vulture for static analysis (#1655)

* Adding vulture for static analysis

Removing dead code found previously by vulture in local runs.
---
 dev_requirements.txt |  3 ++-
 redis/connection.py  |  1 -
 redis/features.py    |  5 -----
 tasks.py             |  2 +-
 tox.ini              | 29 +++++++++++------------------
 whitelist.py         | 12 ++++++++++++
 6 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 redis/features.py
 create mode 100644 whitelist.py

diff --git a/dev_requirements.txt b/dev_requirements.txt
index d3f91fe..aa9d8f9 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -3,4 +3,5 @@ pytest==6.2.5
 tox==3.24.4
 tox-docker==3.1.0
 invoke==1.6.0
-pytest-cov>=3.0.0
\ No newline at end of file
+pytest-cov>=3.0.0
+vulture>=2.3.0
diff --git a/redis/connection.py b/redis/connection.py
index c99c550..f5d6a38 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -746,7 +746,6 @@ class Connection:
         sock = self._sock
         if not sock:
             self.connect()
-            sock = self._sock
         return self._parser.can_read(timeout)
 
     def read_response(self):
diff --git a/redis/features.py b/redis/features.py
deleted file mode 100644
index a96bac7..0000000
--- a/redis/features.py
+++ /dev/null
@@ -1,5 +0,0 @@
-try:
-    import hiredis  # noqa
-    HIREDIS_AVAILABLE = True
-except ImportError:
-    HIREDIS_AVAILABLE = False
diff --git a/tasks.py b/tasks.py
index aa965c6..4ca2242 100644
--- a/tasks.py
+++ b/tasks.py
@@ -23,7 +23,7 @@ def devenv(c):
 @task
 def linters(c):
     """Run code linters"""
-    run("flake8")
+    run("tox -e linters")
 
 
 @task
diff --git a/tox.ini b/tox.ini
index 67b7e75..211f69e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ markers =
 [tox]
 minversion = 3.2.0
 requires = tox-docker
-envlist = {py35,py36,py37,py38,py39,pypy3}-{plain,hiredis}, flake8
+envlist = {py35,py36,py37,py38,py39,pypy3}-{plain,hiredis},linters
 
 [docker:master]
 name = master
@@ -102,9 +102,12 @@ docker =
     lots-of-pythons
 commands = /usr/bin/echo
 
-[testenv:flake8]
+[testenv:linters]
 deps_files = dev_requirements.txt
-commands = flake8
+docker=
+commands =
+    flake8
+    vulture redis whitelist.py --min-confidence 80
 skipsdist = true
 skip_install = true
 
@@ -114,18 +117,8 @@ basepython = pypy3
 [testenv:pypy3-hiredis]
 basepython = pypy3
 
-#[testenv:codecov]
-#deps = codecov
-#commands = codecov
-#passenv =
-#  REDIS_*
-#  CI
-#  CI_*
-#  CODECOV_*
-#  SHIPPABLE
-#  GITHUB_*
-#  VCS_*
-#
-#[testenv:covreport]
-#deps = coverage
-#commands = coverage report
+[flake8]
+exclude =
+    .venv,
+    .tox,
+    whitelist.py
diff --git a/whitelist.py b/whitelist.py
new file mode 100644
index 0000000..891ccd6
--- /dev/null
+++ b/whitelist.py
@@ -0,0 +1,12 @@
+exc_type  # unused variable (/data/repos/redis/redis-py/redis/client.py:1045)
+exc_value  # unused variable (/data/repos/redis/redis-py/redis/client.py:1045)
+traceback  # unused variable (/data/repos/redis/redis-py/redis/client.py:1045)
+exc_type  # unused variable (/data/repos/redis/redis-py/redis/client.py:1211)
+exc_value  # unused variable (/data/repos/redis/redis-py/redis/client.py:1211)
+traceback  # unused variable (/data/repos/redis/redis-py/redis/client.py:1211)
+exc_type  # unused variable (/data/repos/redis/redis-py/redis/client.py:1589)
+exc_value  # unused variable (/data/repos/redis/redis-py/redis/client.py:1589)
+traceback  # unused variable (/data/repos/redis/redis-py/redis/client.py:1589)
+exc_type  # unused variable (/data/repos/redis/redis-py/redis/lock.py:156)
+exc_value  # unused variable (/data/repos/redis/redis-py/redis/lock.py:156)
+traceback  # unused variable (/data/repos/redis/redis-py/redis/lock.py:156)
-- 
cgit v1.2.1