Merge pull request #47 from oleksiyVeretiuk/a499878011598746_separati…

…ng_awarding Fix imports
openprocurement · Apr 2, 2018 · 9876945 · 9876945
2 parents 7010894 + 0dab3f0
commit 9876945
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/openprocurement/auctions/flash/models.py b/openprocurement/auctions/flash/models.py
@@ -35,12 +35,18 @@
 from openprocurement.api.interfaces import (
     IAwardingNextCheck
 )
-from openprocurement.api.models import (
+from openprocurement.api.models.schematics_extender import (
     IsoDateTimeType,
     ListType,
     Model,
+    TZ,
+)
+from openprocurement.api.models.models import (
+    Period,
+    PeriodEndRequired
+)
+from openprocurement.api.models.auction_models.models import (
     Value,
-    PeriodEndRequired,
     Revision,
     Cancellation,
     Feature,
@@ -49,11 +55,10 @@
     validate_features_uniq,
     validate_items_uniq,
     validate_lots_uniq,
-    Period,
-    TZ,
     get_now,
     ComplaintModelType
 )
+
 from openprocurement.api.utils import (
     get_request_from_root
 )

diff --git a/openprocurement/auctions/flash/tests/blanks/chronograph_blanks.py b/openprocurement/auctions/flash/tests/blanks/chronograph_blanks.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 
 # AuctionSwitchtenderingResourceTest
 

diff --git a/openprocurement/auctions/flash/tests/blanks/contract_blanks.py b/openprocurement/auctions/flash/tests/blanks/contract_blanks.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from datetime import timedelta
 
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 
 # AuctionContractResourceTest
 

diff --git a/openprocurement/auctions/flash/tests/blanks/tender_blanks.py b/openprocurement/auctions/flash/tests/blanks/tender_blanks.py
@@ -2,7 +2,7 @@
 from copy import deepcopy
 from datetime import timedelta
 
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 from openprocurement.api.constants import SANDBOX_MODE
 
 from openprocurement.auctions.flash.models import Auction

diff --git a/openprocurement/auctions/flash/views/bid.py b/openprocurement/auctions/flash/views/bid.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 from openprocurement.api.utils import (
     json_view,
     context_unpack,

diff --git a/openprocurement/auctions/flash/views/bid_document.py b/openprocurement/auctions/flash/views/bid_document.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 from openprocurement.api.utils import (
     get_file,
     upload_file,

diff --git a/openprocurement/auctions/flash/views/complaint.py b/openprocurement/auctions/flash/views/complaint.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 from openprocurement.api.utils import (
     context_unpack,
     json_view,

diff --git a/openprocurement/auctions/flash/views/question.py b/openprocurement/auctions/flash/views/question.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openprocurement.api.models import get_now
+from openprocurement.api.models.auction_models.models import get_now
 from openprocurement.api.utils import (
     json_view,
     context_unpack,