Commit 5b4c6a5e by Lucas Cavalcante de Sousa Committed by Steph Samson

Remove unused functions

Resolves: #3236

\#3236 states that some functions are defined but never used, thus this
PR remove then. While removing them, this also makes sure that there is
no trouble with:
```bash
$ poetry run pytest tests/
$ poetry run pre-commit run --all-files
```
as stated at `CONTRIBUTING.md`.

The functions removed were:

- `poetry/config/config.py`:
  + `_get_validator`

- `poetry/console/commands/config.py`:
  + `_list_setting`
  + `_get_formatted_value`

- `poetry/console/commands/run.py` :
  + `_module`

- `poetry/console/commands/self/update.py :
  + `_bin_path`

- `poetry/mixology/version_solver.py`:
  + `_excludes_single_version`

- `poetry/puzzle/provider.py`:
  + `_formatter_elapsed`

- `poetry/utils/setup_reader.py`:
  + `_is_empty_result`

By removing some of those functions Flack announced that there is no
more need to do some includes, so they were removed too:
- `poetry/mixology/version_solver.py`:
  + `from typing import Any`
  + `from poetry.core.semver import Version`
  + `from poetry.core.semver import VersionRange`
- `poetry/puzzle/provider.py`:
  + `import time`
parent e43bc9ad
...@@ -136,18 +136,6 @@ class Config(object): ...@@ -136,18 +136,6 @@ class Config(object):
return re.sub(r"{(.+?)}", lambda m: self.get(m.group(1)), value) return re.sub(r"{(.+?)}", lambda m: self.get(m.group(1)), value)
def _get_validator(self, name): # type: (str) -> Callable
if name in {
"virtualenvs.create",
"virtualenvs.in-project",
"virtualenvs.options.always-copy",
"installer.parallel",
}:
return boolean_validator
if name == "virtualenvs.path":
return str
def _get_normalizer(self, name): # type: (str) -> Callable def _get_normalizer(self, name): # type: (str) -> Callable
if name in { if name in {
"virtualenvs.create", "virtualenvs.create",
......
...@@ -302,14 +302,6 @@ To remove a repository (repo is a short alias for repositories): ...@@ -302,14 +302,6 @@ To remove a repository (repo is a short alias for repositories):
self.line(message) self.line(message)
def _list_setting(self, contents, setting=None, k=None, default=None):
values = self._get_setting(contents, setting, k, default)
for value in values:
self.line(
"<comment>{}</comment> = <info>{}</info>".format(value[0], value[1])
)
def _get_setting(self, contents, setting=None, k=None, default=None): def _get_setting(self, contents, setting=None, k=None, default=None):
orig_k = k orig_k = k
...@@ -351,11 +343,3 @@ To remove a repository (repo is a short alias for repositories): ...@@ -351,11 +343,3 @@ To remove a repository (repo is a short alias for repositories):
values.append(((k or "") + key, value)) values.append(((k or "") + key, value))
return values return values
def _get_formatted_value(self, value):
if isinstance(value, list):
value = [json.dumps(val) if isinstance(val, list) else val for val in value]
value = "[{}]".format(", ".join(value))
return json.dumps(value)
...@@ -47,14 +47,3 @@ class RunCommand(EnvCommand): ...@@ -47,14 +47,3 @@ class RunCommand(EnvCommand):
] ]
return self.env.execute(*cmd) return self.env.execute(*cmd)
@property
def _module(self):
from poetry.core.masonry.utils.module import Module
poetry = self.poetry
package = poetry.package
path = poetry.file.parent
module = Module(package.name, path.as_posix(), package.packages)
return module
...@@ -257,14 +257,6 @@ class SelfUpdateCommand(Command): ...@@ -257,14 +257,6 @@ class SelfUpdateCommand(Command):
return "poetry-{}-{}".format(version, platform) return "poetry-{}-{}".format(version, platform)
def _bin_path(self, base_path, bin):
from poetry.utils._compat import WINDOWS
if WINDOWS:
return (base_path / "Scripts" / bin).with_suffix(".exe")
return base_path / "bin" / bin
def make_bin(self): def make_bin(self):
from poetry.utils._compat import WINDOWS from poetry.utils._compat import WINDOWS
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
import time import time
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from typing import Any
from typing import Dict from typing import Dict
from typing import List from typing import List
from typing import Union from typing import Union
...@@ -10,8 +9,6 @@ from typing import Union ...@@ -10,8 +9,6 @@ from typing import Union
from poetry.core.packages import Dependency from poetry.core.packages import Dependency
from poetry.core.packages import Package from poetry.core.packages import Package
from poetry.core.packages import ProjectPackage from poetry.core.packages import ProjectPackage
from poetry.core.semver import Version
from poetry.core.semver import VersionRange
from .failure import SolveFailure from .failure import SolveFailure
from .incompatibility import Incompatibility from .incompatibility import Incompatibility
...@@ -423,9 +420,6 @@ class VersionSolver: ...@@ -423,9 +420,6 @@ class VersionSolver:
return dependency.complete_name return dependency.complete_name
def _excludes_single_version(self, constraint): # type: (Any) -> bool
return isinstance(VersionRange().difference(constraint), Version)
def _result(self): # type: () -> SolverResult def _result(self): # type: () -> SolverResult
""" """
Creates a #SolverResult from the decisions in _solution Creates a #SolverResult from the decisions in _solution
......
import logging import logging
import os import os
import re import re
import time
from contextlib import contextmanager from contextlib import contextmanager
from tempfile import mkdtemp from tempfile import mkdtemp
...@@ -44,10 +43,7 @@ logger = logging.getLogger(__name__) ...@@ -44,10 +43,7 @@ logger = logging.getLogger(__name__)
class Indicator(ProgressIndicator): class Indicator(ProgressIndicator):
def _formatter_elapsed(self): pass
elapsed = time.time() - self._start_time
return "{:.1f}s".format(elapsed)
class Provider: class Provider:
......
...@@ -59,14 +59,6 @@ class SetupReader(object): ...@@ -59,14 +59,6 @@ class SetupReader(object):
return result return result
@classmethod
def _is_empty_result(cls, result): # type: (Dict[str, Any]) -> bool
return (
not result["install_requires"]
and not result["extras_require"]
and not result["python_requires"]
)
def read_setup_py( def read_setup_py(
self, filepath self, filepath
): # type: (Union[basestring, Path]) -> Dict[str, Union[List, Dict]] ): # type: (Union[basestring, Path]) -> Dict[str, Union[List, Dict]]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment