Skip to content

Commit fee92ee

Browse files
authored
Clean up dead code (#1125)
Using https://github.com/asottile/dead
1 parent 9e4868d commit fee92ee

File tree

7 files changed

+2
-49
lines changed

7 files changed

+2
-49
lines changed

src/tox/_quickstart.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,6 @@ def boolean(x):
9292
return x.upper() in ("Y", "YES")
9393

9494

95-
def suffix(x):
96-
if not (x[0:1] == "." and len(x) > 1):
97-
raise ValidationError("Please enter a file suffix, e.g. '.rst' or '.txt'.")
98-
return x
99-
100-
101-
def ok(x):
102-
return x
103-
104-
10595
def list_modificator(answer, existing=None):
10696
if not existing:
10797
existing = []

src/tox/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def _construct_default_factors(cpython_versions, pypy_versions, other_interprete
2727

2828
class PYTHON:
2929
PY_FACTORS_RE = re.compile("^(?!py$)(py|pypy|jython)([2-9][0-9]?)?$")
30-
PY_FACTORS_MAP = {"py": "python", "pypy": "pypy", "jython": "jython"}
3130
CPYTHON_VERSION_TUPLES = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)]
3231
PYPY_VERSION_TUPLES = [(2, 7), (3, 5)]
3332
OTHER_PYTHON_INTERPRETERS = ["jython"]

src/tox/exception.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ def __str__(self):
6868
return exit_code_str(self.__class__.__name__, self.command, self.exit_code)
6969

7070

71-
class MissingFile(Error):
72-
"""An error while invoking a script."""
73-
74-
7571
class MissingDirectory(Error):
7672
"""A directory did not exist."""
7773

src/tox/interpreters.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ def __init__(self, executable, source, out, err):
101101

102102

103103
class InterpreterInfo:
104-
runnable = True
105-
106104
def __init__(self, name, executable, version_info, sysplatform):
107105
assert executable and version_info
108106
self.name = name
@@ -115,8 +113,6 @@ def __str__(self):
115113

116114

117115
class NoInterpreterInfo:
118-
runnable = False
119-
120116
def __init__(self, name, executable=None, out=None, err="not found"):
121117
self.name = name
122118
self.executable = executable

src/tox/session.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,6 @@ class Verbosity(object):
288288

289289

290290
class Reporter(object):
291-
actionchar = "-"
292-
293291
def __init__(self, session):
294292
self.tw = py.io.TerminalWriter()
295293
self.session = session
@@ -472,16 +470,6 @@ def cleanup(self):
472470
tox_env.package.remove()
473471
py.path.local(tox_env.package.dirname).remove(ignore_errors=True)
474472

475-
def _copyfiles(self, srcdir, pathlist, destdir):
476-
for relpath in pathlist:
477-
src = srcdir.join(relpath)
478-
if not src.check():
479-
self.report.error("missing source file: {}".format(src))
480-
raise SystemExit(1)
481-
target = destdir.join(relpath)
482-
target.dirpath().ensure(dir=1)
483-
src.copy(target)
484-
485473
def make_emptydir(self, path):
486474
if path.check():
487475
self.report.info(" removing {}".format(path))

src/tox/venv.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import pipes
55
import re
66
import sys
7-
import warnings
87
from itertools import chain
98

109
import py
@@ -244,14 +243,6 @@ def _getliveconfig(self):
244243
alwayscopy,
245244
)
246245

247-
def _getresolvedeps(self):
248-
warnings.warn(
249-
"that's a private function there, use get_resolved_dependencies,"
250-
"this will be removed in 3.2",
251-
category=DeprecationWarning,
252-
)
253-
return self.get_resolved_dependencies()
254-
255246
def get_resolved_dependencies(self):
256247
dependencies = []
257248
for dependency in self.envconfig.deps:

tests/unit/test_interpreters.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class envconfig:
136136
info = interpreters.get_info(envconfig)
137137
assert info.version_info == tuple(sys.version_info)
138138
assert info.executable == sys.executable
139-
assert info.runnable
139+
assert isinstance(info, InterpreterInfo)
140140

141141
def test_get_executable_no_exist(self, interpreters):
142142
class envconfig:
@@ -148,7 +148,7 @@ class envconfig:
148148
assert not info.version_info
149149
assert info.name == "1lkj23"
150150
assert not info.executable
151-
assert not info.runnable
151+
assert isinstance(info, NoInterpreterInfo)
152152

153153
def test_get_sitepackagesdir_error(self, interpreters):
154154
class envconfig:
@@ -179,9 +179,6 @@ def info(
179179
):
180180
return InterpreterInfo(name, executable, version_info, sysplatform)
181181

182-
def test_runnable(self):
183-
assert self.info().runnable
184-
185182
@pytest.mark.parametrize("missing_arg", ("executable", "version_info"))
186183
def test_assert_on_missing_args(self, missing_arg):
187184
with pytest.raises(AssertionError):
@@ -200,10 +197,6 @@ def test_str(self):
200197

201198

202199
class TestNoInterpreterInfo:
203-
def test_runnable(self):
204-
assert not NoInterpreterInfo("foo").runnable
205-
assert not NoInterpreterInfo("foo", executable=sys.executable).runnable
206-
207200
def test_default_data(self):
208201
x = NoInterpreterInfo("foo")
209202
assert x.name == "foo"

0 commit comments

Comments
 (0)