Merge pull request #861 from geometalab/feature/#845-merge-utils-pack…

…ages

Feature/#845 merge utils packages

osmaxx/excerptexport/forms/excerpt_form.py

@@ -1,16 +1,15 @@
 import json
 
-from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
-from django import forms
-from django.core.urlresolvers import reverse
-
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Fieldset, Field, Submit
+from django import forms
+from django.core.exceptions import ValidationError
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext_lazy as _
 
-from .order_options_mixin import OrderOptionsMixin
 from osmaxx.excerptexport.models import Excerpt, ExtractionOrder
-from osmaxx.utilities.dict_helpers import select_keys
+from osmaxx.utils.dict_helpers import select_keys
+from .order_options_mixin import OrderOptionsMixin
 
 
 class ExcerptForm(OrderOptionsMixin, forms.ModelForm):

osmaxx/excerptexport/models/export.py

@@ -97,7 +97,7 @@ def update_is_overdue(self):
         return (self.updated_at + EXTRACTION_PROCESSING_TIMEOUT_TIMEDELTA) < timezone.now()
 
     def _handle_changed_status(self, *, incoming_request):
-        from osmaxx.utilities.shortcuts import Emissary
+        from osmaxx.utils.shortcuts import Emissary
         emissary = Emissary(recipient=self.extraction_order.orderer)
         status_changed_message = self._get_export_status_changed_message()
         if self.status == self.FAILED:

osmaxx/excerptexport/models/extraction_order.py

@@ -74,7 +74,7 @@ def get_absolute_url(self):
 
     def send_email_if_all_exports_done(self, incoming_request):
         if all(export.is_status_final for export in self.exports.all()):
-            from osmaxx.utilities.shortcuts import Emissary
+            from osmaxx.utils.shortcuts import Emissary
             emissary = Emissary(recipient=self.orderer)
             emissary.inform_mail(
                 subject=self._get_all_exports_done_email_subject(),

osmaxx/job_progress/middleware.py

@@ -7,7 +7,7 @@
 from osmaxx.api_client import ConversionApiClient
 from osmaxx.conversion_api.statuses import FINAL_STATUSES, FAILED
 from osmaxx.excerptexport.models import Export
-from osmaxx.utilities.shortcuts import get_cached_or_set
+from osmaxx.utils.shortcuts import get_cached_or_set
 
 logger = logging.getLogger(__name__)
 

osmaxx/locale/en/LC_MESSAGES/django.po

@@ -1124,7 +1124,7 @@ msgstr ""
 msgid "Rest API"
 msgstr ""
 
-#: osmaxx/utilities/shortcuts.py:43
+#: osmaxx/utils/shortcuts.py:43
 msgid ""
 "There is no email address assigned to your account. You won't be notified by "
 "email!"

tests/excerptexport/models/test_plain_text_email_rendering.py

@@ -1,9 +1,8 @@
 from django.contrib.auth import get_user_model
+from hamcrest import contains_string, match_equality
 
 from osmaxx.excerptexport.models import ExtractionOrder, Excerpt
-from osmaxx.utilities.shortcuts import Emissary
-
-from hamcrest import contains_string, match_equality
+from osmaxx.utils.shortcuts import Emissary
 
 
 def test_send_email_if_all_exports_done_keeps_special_characters_unescaped(mocker, rf):

tests/job_progress/test_job_progress.py

@@ -81,7 +81,7 @@ def test_calling_tracker_with_payload_indicating_started_updates_export_status(s
         self.export.refresh_from_db()
         self.assertEqual(self.export.status, STARTED)
 
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_queued_informs_user(
             self, emissary_class_mock, *args, **mocks):
         emissary_mock = emissary_class_mock()
@@ -103,7 +103,7 @@ def test_calling_tracker_with_payload_indicating_queued_informs_user(
             )
         )
 
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_started_informs_user(
             self, emissary_class_mock, *args, **mocks):
         emissary_mock = emissary_class_mock()
@@ -126,7 +126,7 @@ def test_calling_tracker_with_payload_indicating_started_informs_user(
             )
         )
 
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_failed_informs_user_with_error(
             self, emissary_class_mock, *args, **mocks):
         emissary_mock = emissary_class_mock()
@@ -149,7 +149,7 @@ def test_calling_tracker_with_payload_indicating_failed_informs_user_with_error(
         )
 
     @patch.object(Export, '_fetch_result_file')
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_finished_informs_user_with_success(
             self, emissary_class_mock, *args, **mocks):
         emissary_mock = emissary_class_mock()
@@ -171,7 +171,7 @@ def test_calling_tracker_with_payload_indicating_finished_informs_user_with_succ
             )
         )
 
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_unchanged_status_does_not_inform_user(
             self, emissary_class_mock, *args, **mocks):
         self.export.status = 'started'
@@ -222,7 +222,7 @@ def test_calling_tracker_with_payload_indicating_status_finished_downloads_resul
 
     @requests_mock.Mocker(kw='requests')
     @patch.object(ConversionApiClient, 'authorized_get', ConversionApiClient.get)  # circumvent authorization logic
-    @patch('osmaxx.utilities.shortcuts.Emissary')
+    @patch('osmaxx.utils.shortcuts.Emissary')
     def test_calling_tracker_with_payload_indicating_final_status_for_only_remaining_nonfinal_export_of_extraction_order_advertises_downloads(
             self, emissary_class_mock, *args, **mocks):
         self.export.conversion_service_job_id = 1

tests/utilities/test_dict_helpers.py → tests/utils/test_dict_helpers.py

@@ -1,6 +1,6 @@
 from unittest.case import TestCase
 
-from osmaxx.utilities.dict_helpers import are_all_keys_in
+from osmaxx.utils.dict_helpers import are_all_keys_in
 
 
 class AreAllKeysInTest(TestCase):