Use senaite.core.api instead of senaite.api

buildout.cfg

@@ -44,7 +44,6 @@ develop = .
 [sources]
 senaite.core = git git://github.com/senaite/senaite.core.git pushurl=git@github.com:senaite/senaite.core.git branch=master
 senaite.lims = git git://github.com/senaite/senaite.lims.git pushurl=git@github.com:senaite/senaite.lims.git branch=master
-senaite.api = git git://github.com/senaite/senaite.api.git pushurl=git@github.com:senaite/senaite.api.git branch=master
 senaite.core.supermodel = git git://github.com/senaite/senaite.core.supermodel.git pushurl=git@github.com:senaite/senaite.core.supermodel.git branch=master
 senaite.core.listing = git git://github.com/senaite/senaite.core.listing.git pushurl=git@github.com:senaite/senaite.core.listing.git branch=master
 

docs/Changelog.rst

@@ -1,6 +1,7 @@
 1.2.2 (unreleased)
 ------------------
 
+- #79: Use senaite.core.api instead of senaite.api
 - #78: Fix template error on missing lab address data
 
 

src/senaite/impress/analysisrequest/model.py

@@ -24,7 +24,7 @@
 from bika.lims.utils import formatDecimalMark
 from bika.lims.utils import to_utf8
 from bika.lims.utils.analysis import format_uncertainty
-from senaite import api
+from bika.lims import api
 from senaite.core.supermodel import SuperModel as BaseModel
 from senaite.impress import logger
 from senaite.impress.decorators import returns_super_model

src/senaite/impress/analysisrequest/reportview.py

@@ -31,7 +31,7 @@
 from bika.lims.workflow import getTransitionDate
 from Products.CMFPlone.i18nl10n import ulocalized_time
 from Products.CMFPlone.utils import safe_unicode
-from senaite import api
+from bika.lims import api
 from senaite.core.supermodel.interfaces import ISuperModel
 from senaite.impress import logger
 from senaite.impress.decorators import returns_super_model

src/senaite/impress/decorators.py

@@ -23,7 +23,7 @@
 import time
 from functools import wraps
 
-from senaite import api
+from bika.lims import api
 from senaite.core.supermodel.interfaces import ISuperModel
 from senaite.impress import logger
 from zope.component import queryAdapter

src/senaite/impress/publisher.py

@@ -26,7 +26,7 @@
 
 import bs4
 from plone.subrequest import subrequest
-from senaite import api
+from bika.lims import api
 from senaite.impress import logger
 from senaite.impress.decorators import synchronized
 from senaite.impress.interfaces import IPublisher

src/senaite/impress/publishview.py

@@ -27,7 +27,7 @@
 from plone.resource.utils import iterDirectoriesOfType
 from Products.Five import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from senaite import api
+from bika.lims import api
 from senaite.core.supermodel.interfaces import ISuperModel
 from senaite.impress import logger
 from senaite.impress.config import PAPERFORMATS

src/senaite/impress/reportview.py

@@ -18,7 +18,7 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-from senaite import api
+from bika.lims import api
 from senaite.impress.interfaces import IReportView
 from zope.interface import implements