Changeset 12718 for main/waeup.ikoba/branches/uli-payments/src

Timestamp:

10 Mar 2015, 15:52:18 (10 years ago)

Author:

uli

Message:

contract finder does not complain about missing catalog.

Location:

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers

Files:

• contracts.py (modified) (2 diffs)
• tests/test_contract.py (modified) (1 diff)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/contracts.py

@@ -21 +21 @@
 import grok
 from zope.catalog.interfaces import ICatalog
-from zope.component import getUtility
+from zope.component import getUtility, queryUtility
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
@@ -266 +266 @@
 
     def get_payable_by_id(self, contract_id):
-        catalog = getUtility(ICatalog, 'contracts_catalog')
+        catalog = queryUtility(ICatalog, 'contracts_catalog')
+        if catalog is None:
+            return None
         result = catalog.searchResults(
             contract_id=(contract_id, contract_id))

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/tests/test_contract.py

@@ -181 +181 @@
         result = finder.get_payable_by_id('Not-a-valid-id')
         self.assertTrue(result is None)
+
+    def test_contract_finder_no_catalog(self):
+        # contract finder does not complain about missing catalog
+        finder = ContractFinder()
+        result = finder.get_payable_by_id('CON1234')
+        self.assertTrue(result is None)