refactoring: #845 rename module "statuses" to "status"

geometalab · May 9, 2017 · 04da18d · 04da18d
1 parent da357ff
commit 04da18d
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/osmaxx/conversion/constants/statuses.py → osmaxx/conversion/constants/status.py b/osmaxx/conversion/constants/statuses.py → osmaxx/conversion/constants/status.py
diff --git a/osmaxx/conversion/management/commands/result_harvester.py b/osmaxx/conversion/management/commands/result_harvester.py
@@ -12,7 +12,7 @@
 
 from osmaxx.conversion import models as conversion_models
 from osmaxx.conversion._settings import CONVERSION_SETTINGS
-from osmaxx.conversion.constants.statuses import FINAL_STATUSES, FINISHED, FAILED
+from osmaxx.conversion.constants.status import FINAL_STATUSES, FINISHED, FAILED
 
 logging.basicConfig()
 logger = logging.getLogger(__name__)

diff --git a/osmaxx/conversion/models.py b/osmaxx/conversion/models.py
@@ -12,7 +12,7 @@
 from osmaxx.conversion.converters.converter_gis.detail_levels import DETAIL_LEVEL_CHOICES, DETAIL_LEVEL_ALL
 from osmaxx.conversion.constants.coordinate_reference_systems import CRS_CHOICES
 from osmaxx.conversion.constants.formats import FORMAT_CHOICES
-from osmaxx.conversion.constants.statuses import STATUS_CHOICES, RECEIVED
+from osmaxx.conversion.constants.status import STATUS_CHOICES, RECEIVED
 
 
 def job_directory_path(instance, filename):

diff --git a/osmaxx/excerptexport/models/export.py b/osmaxx/excerptexport/models/export.py
@@ -41,7 +41,7 @@ class Export(TimeStampModelMixin, models.Model):
     - the transformation of the data from the data sources' schemata (e.g. ``osm2pgsql`` schema) to the OSMaxx schema
     - the actual export to one specific GIS or navigation file format with one specific set of parameters
     """
-    from osmaxx.conversion.constants.statuses import RECEIVED, QUEUED, FINISHED, FAILED, STARTED, DEFERRED, FINAL_STATUSES, STATUS_CHOICES  # noqa
+    from osmaxx.conversion.constants.status import RECEIVED, QUEUED, FINISHED, FAILED, STARTED, DEFERRED, FINAL_STATUSES, STATUS_CHOICES  # noqa
     INITIAL = 'initial'
     INITIAL_CHOICE = (INITIAL, _('initial'))
     STATUS_CHOICES = (INITIAL_CHOICE,) + STATUS_CHOICES

diff --git a/osmaxx/excerptexport/views.py b/osmaxx/excerptexport/views.py
@@ -14,7 +14,7 @@
 from django.views.generic.list import ListView
 
 from osmaxx.contrib.auth.frontend_permissions import EmailRequiredMixin
-from osmaxx.conversion.constants import statuses
+from osmaxx.conversion.constants import status
 from osmaxx.excerptexport.forms import ExcerptForm, ExistingForm
 from osmaxx.excerptexport.models import Excerpt
 from osmaxx.excerptexport.models import ExtractionOrder
@@ -70,7 +70,7 @@ def get_object(self, queryset=None):
 
 
 class ExportsListMixin:
-    _filterable_statuses = frozenset({statuses.FINISHED, statuses.FAILED})
+    _filterable_statuses = frozenset({status.FINISHED, status.FAILED})
 
     @property
     def excerpt_ids(self):

diff --git a/osmaxx/job_progress/middleware.py b/osmaxx/job_progress/middleware.py
@@ -5,7 +5,7 @@
 from requests import HTTPError
 
 from osmaxx.api_client import ConversionApiClient
-from osmaxx.conversion.constants.statuses import FINAL_STATUSES, FAILED
+from osmaxx.conversion.constants.status import FINAL_STATUSES, FAILED
 from osmaxx.excerptexport.models import Export
 from osmaxx.utils.shortcuts import get_cached_or_set
 

diff --git a/tests/conversion/conftest.py b/tests/conversion/conftest.py
@@ -8,7 +8,7 @@
 import osmaxx.conversion.constants.formats
 from osmaxx.conversion.converters.converter_gis import detail_levels
 from osmaxx.conversion.constants import coordinate_reference_systems as crs
-from osmaxx.conversion.constants.statuses import STARTED, FAILED, FINISHED
+from osmaxx.conversion.constants.status import STARTED, FAILED, FINISHED
 
 format_list = osmaxx.conversion.constants.formats.FORMAT_DEFINITIONS.keys()
 

diff --git a/tests/conversion/management/commands/result_harvester_test.py b/tests/conversion/management/commands/result_harvester_test.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from osmaxx.conversion.constants.statuses import STARTED
+from osmaxx.conversion.constants.status import STARTED
 
 
 @pytest.fixture

diff --git a/tests/conversion/model_test.py b/tests/conversion/model_test.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from osmaxx.conversion.constants.statuses import STARTED, FAILED, FINISHED
+from osmaxx.conversion.constants.status import STARTED, FAILED, FINISHED
 
 
 @pytest.mark.django_db()

diff --git a/tests/conversion/view_test.py b/tests/conversion/view_test.py
@@ -1,7 +1,7 @@
 import pytest
 from rest_framework.reverse import reverse
 
-from osmaxx.conversion.constants.statuses import RECEIVED
+from osmaxx.conversion.constants.status import RECEIVED
 
 authenticated_access_urls = [
     reverse('clipping_area-list'),

diff --git a/tests/excerptexport/test_conversion_api_client.py b/tests/excerptexport/test_conversion_api_client.py
@@ -10,7 +10,7 @@
 
 from osmaxx.api_client import ConversionApiClient, API_client
 from osmaxx.conversion.constants.formats import FGDB, SPATIALITE
-from osmaxx.conversion.constants.statuses import RECEIVED
+from osmaxx.conversion.constants.status import RECEIVED
 from osmaxx.excerptexport.models import Excerpt, ExtractionOrder
 from osmaxx.job_progress.views import tracker
 from tests.test_helpers import vcr_explicit_path as vcr

diff --git a/tests/excerptexport/test_models.py b/tests/excerptexport/test_models.py
@@ -4,7 +4,7 @@
 from hamcrest import assert_that, contains_inanyorder as contains_in_any_order
 
 from osmaxx.conversion.constants.formats import GARMIN
-from osmaxx.conversion.constants.statuses import FINISHED
+from osmaxx.conversion.constants.status import FINISHED
 from osmaxx.excerptexport import models
 
 

diff --git a/tests/job_progress/test_job_progress.py b/tests/job_progress/test_job_progress.py
@@ -13,7 +13,7 @@
 
 from osmaxx import excerptexport
 from osmaxx.api_client.conversion_api_client import ConversionApiClient
-from osmaxx.conversion.constants.statuses import STARTED, QUEUED, FINISHED, FAILED
+from osmaxx.conversion.constants.status import STARTED, QUEUED, FINISHED, FAILED
 from osmaxx.excerptexport.models.excerpt import Excerpt
 from osmaxx.excerptexport.models.export import Export
 from osmaxx.excerptexport.models.extraction_order import ExtractionOrder