From 5822e79a9355970a1190194e351a4761e9db6859 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 18 Oct 2019 10:49:24 +0300 Subject: Revert "Change: move exceptions to exceptions.py, rename persitent.py" This reverts commit 066664763f16318076e34d702cce746b2fd4afca. --- ick2/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ick2/__init__.py') diff --git a/ick2/__init__.py b/ick2/__init__.py index 2720d61..7229a5f 100644 --- a/ick2/__init__.py +++ b/ick2/__init__.py @@ -17,8 +17,10 @@ from .version import __version__, __version_info__ from .logging import setup_logging, log from .store import ( MemoryStore, + Conflict, ) -from .resource import ( +from .persistent import ( + NotFound, Resource, resource_from_dict, ) @@ -48,9 +50,7 @@ from .buildsm import ( ) from .exceptions import ( BadUpdate, - NotFound, ExistsAlready, - Conflict, IckException, MethodNotAllowed, ClientIdMissing, -- cgit v1.2.1