diff --git a/atpbar/funcs.py b/atpbar/funcs.py index 371b80c..274562f 100644 --- a/atpbar/funcs.py +++ b/atpbar/funcs.py @@ -4,7 +4,7 @@ from collections.abc import Iterator from .machine import StateMachine -from .progressreport import ProgressReporter +from .progress_report import ProgressReporter _machine = StateMachine() diff --git a/atpbar/machine.py b/atpbar/machine.py index 93d2d5f..767d863 100644 --- a/atpbar/machine.py +++ b/atpbar/machine.py @@ -3,7 +3,7 @@ from threading import Lock, current_thread, main_thread from .presentation import create_presentation -from .progressreport import ProgressReporter, ProgressReportPickup, Report +from .progress_report import ProgressReporter, ProgressReportPickup, Report from .stream import StreamQueue, StreamRedirection, register_stream_queue diff --git a/atpbar/main.py b/atpbar/main.py index e6dc2a1..c2399c0 100644 --- a/atpbar/main.py +++ b/atpbar/main.py @@ -5,7 +5,7 @@ from typing import Generic, Optional, TypeVar from .funcs import fetch_reporter -from .progressreport import Report +from .progress_report import Report T = TypeVar('T') diff --git a/atpbar/presentation/base.py b/atpbar/presentation/base.py index cdd348a..d8cf3f6 100755 --- a/atpbar/presentation/base.py +++ b/atpbar/presentation/base.py @@ -5,7 +5,7 @@ from typing import TextIO from uuid import UUID -from atpbar.progressreport import Report +from atpbar.progress_report import Report class Presentation(ABC): diff --git a/atpbar/progressreport/__init__.py b/atpbar/progress_report/__init__.py similarity index 100% rename from atpbar/progressreport/__init__.py rename to atpbar/progress_report/__init__.py diff --git a/atpbar/progressreport/complement.py b/atpbar/progress_report/complement.py similarity index 100% rename from atpbar/progressreport/complement.py rename to atpbar/progress_report/complement.py diff --git a/atpbar/progressreport/pickup.py b/atpbar/progress_report/pickup.py similarity index 100% rename from atpbar/progressreport/pickup.py rename to atpbar/progress_report/pickup.py diff --git a/atpbar/progressreport/report.py b/atpbar/progress_report/report.py similarity index 100% rename from atpbar/progressreport/report.py rename to atpbar/progress_report/report.py diff --git a/atpbar/progressreport/reporter.py b/atpbar/progress_report/reporter.py similarity index 100% rename from atpbar/progressreport/reporter.py rename to atpbar/progress_report/reporter.py diff --git a/tests/progressreport/__init__.py b/tests/progress_report/__init__.py similarity index 100% rename from tests/progressreport/__init__.py rename to tests/progress_report/__init__.py diff --git a/tests/progressreport/test_pickup.py b/tests/progress_report/test_pickup.py similarity index 97% rename from tests/progressreport/test_pickup.py rename to tests/progress_report/test_pickup.py index 382f9b5..4f9f346 100644 --- a/tests/progressreport/test_pickup.py +++ b/tests/progress_report/test_pickup.py @@ -4,7 +4,7 @@ import pytest -from atpbar.progressreport.pickup import ProgressReportPickup +from atpbar.progress_report.pickup import ProgressReportPickup class TestStart: @@ -130,7 +130,7 @@ def mock_short_sleep(self, pickup, monkeypatch): def mock_time(self, monkeypatch): ret = mock.Mock() ret.time.return_value = 1000.0 - from atpbar.progressreport import pickup as m + from atpbar.progress_report import pickup as m monkeypatch.setattr(m, "time", ret) return ret diff --git a/tests/progressreport/test_report_complement.py b/tests/progress_report/test_report_complement.py similarity index 98% rename from tests/progressreport/test_report_complement.py rename to tests/progress_report/test_report_complement.py index 68f1876..7eb2714 100644 --- a/tests/progressreport/test_report_complement.py +++ b/tests/progress_report/test_report_complement.py @@ -1,6 +1,6 @@ import pytest -from atpbar.progressreport.complement import ProgressReportComplementer +from atpbar.progress_report.complement import ProgressReportComplementer @pytest.fixture() diff --git a/tests/progressreport/test_reporter.py b/tests/progress_report/test_reporter.py similarity index 94% rename from tests/progressreport/test_reporter.py rename to tests/progress_report/test_reporter.py index a9e61c6..dcb710a 100644 --- a/tests/progressreport/test_reporter.py +++ b/tests/progress_report/test_reporter.py @@ -4,7 +4,7 @@ import unittest.mock as mock -from atpbar.progressreport.reporter import ProgressReporter +from atpbar.progress_report.reporter import ProgressReporter @pytest.fixture() @@ -15,7 +15,7 @@ def mock_queue(): @pytest.fixture() def mock_time(monkeypatch): ret = mock.Mock() - module = sys.modules["atpbar.progressreport.reporter"] + module = sys.modules["atpbar.progress_report.reporter"] monkeypatch.setattr(module, "time", ret) return ret diff --git a/tests/scenarios/conftest.py b/tests/scenarios/conftest.py index 883cac7..f7a3b67 100644 --- a/tests/scenarios/conftest.py +++ b/tests/scenarios/conftest.py @@ -84,6 +84,6 @@ def machine(monkeypatch): @pytest.fixture(autouse=True) def reporter_interval(monkeypatch): - module = sys.modules["atpbar.progressreport.reporter"] + module = sys.modules["atpbar.progress_report.reporter"] monkeypatch.setattr(module, "DEFAULT_INTERVAL", 0) yield