Skip to content

Commit 29d6db8

Browse files
committed
flake8: fix flake8 issues in our base code
1 parent 0dd9343 commit 29d6db8

File tree

4 files changed

+30
-34
lines changed

4 files changed

+30
-34
lines changed

__main__.py

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,36 @@
2222
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2323
# POSSIBILITY OF SUCH DAMAGE.
2424
"""The main CLI for ioc."""
25-
import locale
2625
import os
27-
import re
28-
import signal
29-
import subprocess as su
3026
import sys
3127

32-
import click
3328

3429
from iocage.cli import cli
3530

3631

3732
def main_safe():
38-
try:
39-
main()
40-
except BaseException as e:
41-
return e
33+
try:
34+
main()
35+
except BaseException as e:
36+
return e
4237

4338

4439
def main():
45-
cli(prog_name="iocage")
40+
cli(prog_name="iocage")
4641

4742

4843
if __name__ == "__main__":
49-
coverdir = os.environ.get("IOCAGE_TRACE", None)
50-
if coverdir is None:
51-
main()
52-
else:
53-
import trace
54-
tracer = trace.Trace(
55-
ignoredirs=[sys.prefix, sys.exec_prefix],
56-
trace=0,
57-
count=1)
58-
tracer.run("main_safe()")
59-
r = tracer.results()
60-
r.write_results(show_missing=True, coverdir=coverdir)
61-
print(f"Iocage Trace written to: {coverdir}")
44+
coverdir = os.environ.get("IOCAGE_TRACE", None)
45+
if coverdir is None:
46+
main()
47+
else:
48+
import trace
49+
tracer = trace.Trace(
50+
ignoredirs=[sys.prefix, sys.exec_prefix],
51+
trace=0,
52+
count=1
53+
)
54+
tracer.run("main_safe()")
55+
r = tracer.results()
56+
r.write_results(show_missing=True, coverdir=coverdir)
57+
print(f"Iocage Trace written to: {coverdir}")

fastentrypoints.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,18 @@ def main():
9494
with open(manifest_path, 'a+') as manifest:
9595
manifest.seek(0)
9696
manifest_content = manifest.read()
97-
if not 'include fastentrypoints.py' in manifest_content:
97+
if 'include fastentrypoints.py' not in manifest_content:
9898
manifest.write(('\n' if manifest_content else '')
9999
+ 'include fastentrypoints.py')
100100

101101
# Insert the import statement to setup.py if not present
102102
with open(setup_path, 'a+') as setup:
103103
setup.seek(0)
104104
setup_content = setup.read()
105-
if not 'import fastentrypoints' in setup_content:
105+
if 'import fastentrypoints' not in setup_content:
106106
setup.seek(0)
107107
setup.truncate()
108108
setup.write('import fastentrypoints\n' + setup_content)
109109

110+
110111
print(__name__)

iocage/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
2222
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2323
# POSSIBILITY OF SUCH DAMAGE.
24-
from iocage.lib import errors, events
25-
from iocage.lib.Host import Host
26-
from iocage.lib.Jail import Jail
27-
from iocage.lib.Jails import Jails
28-
from iocage.lib.Logger import Logger
29-
from iocage.lib.Release import Release
30-
from iocage.lib.Releases import Releases
24+
from iocage.lib import errors, events # noqa: F401
25+
from iocage.lib.Host import Host # noqa: F401
26+
from iocage.lib.Jail import Jail # noqa: F401
27+
from iocage.lib.Jails import Jails # noqa: F401
28+
from iocage.lib.Logger import Logger # noqa: F401
29+
from iocage.lib.Release import Release # noqa: F401
30+
from iocage.lib.Releases import Releases # noqa: F401

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
# POSSIBILITY OF SUCH DAMAGE.
2424
import os.path
2525
import sys
26-
import fastentrypoints
2726
from setuptools import find_packages, setup
2827
from pip.req import parse_requirements
2928

3029
reqs = list(parse_requirements("requirements.txt", session="iocage"))
3130
install_requires = list(map(lambda x: f"{x.name}{x.specifier}", reqs))
3231
dependency_links = list(map(
33-
lambda x: str(x.link),
32+
lambda x: str(x.link),
3433
filter(lambda x: x.link, reqs)
3534
))
3635

0 commit comments

Comments
 (0)