cleanup

Author: sveneberth

src/viur/shop/modules/cart.py

@@ -7,10 +7,11 @@
 from viur.core.prototypes import Tree
 from viur.core.prototypes.tree import SkelType
 from viur.core.session import Session
-from viur.core.skeleton import Skeleton, SkeletonInstance, without_render_preparation
+from viur.core.skeleton import Skeleton, SkeletonInstance
 from viur.shop.modules.abstract import ShopModuleAbstract
 from viur.shop.types import *
 from viur.shop.types.exceptions import InvalidStateError
+
 from ..globals import MAX_FETCH_LIMIT, SENTINEL, SHOP_INSTANCE, SHOP_LOGGER
 from ..services import EVENT_SERVICE, Event
 from ..skeletons.article import ArticleAbstractSkel
@@ -19,6 +20,11 @@
 
 logger = SHOP_LOGGER.getChild(__name__)
 
+if conf.version >= (3, 8, 15):  # TODO: 3,8,16
+    from viur.core.skeleton.utils import without_render_preparation
+else:
+    from viur.toolkit import without_render_preparation
+
 
 class Cart(ShopModuleAbstract, Tree):
     moduleName = "cart"

src/viur/shop/skeletons/cart.py

@@ -446,9 +446,7 @@ def article_skel_full(self) -> SkeletonInstance_T[ArticleAbstractSkel]:
         except KeyError:
             # logger.debug(f'Read article_skel_full {self.article_skel["key"]=}')
             skel = SHOP_INSTANCE.get().article_skel()
-            res = skel.read(self.article_skel["key"])
-            logger.info(f"skel.read {res=}")
-            assert res
+            assert skel.read(self.article_skel["key"]) is not None
             CartItemSkel.get_article_cache()[self.article_skel["key"]] = skel
             return skel