summaryrefslogtreecommitdiff
path: root/ick2/__init__.py
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2019-10-18 10:49:24 +0300
committerLars Wirzenius <liw@liw.fi>2019-10-18 10:49:24 +0300
commit5822e79a9355970a1190194e351a4761e9db6859 (patch)
tree83947c82747eb7404a575e40594e9afd059bfd08 /ick2/__init__.py
parenta799ddebdc516dba40a846e7e370825049cd97d7 (diff)
downloadick2-5822e79a9355970a1190194e351a4761e9db6859.tar.gz
Revert "Change: move exceptions to exceptions.py, rename persitent.py"
This reverts commit 066664763f16318076e34d702cce746b2fd4afca.
Diffstat (limited to 'ick2/__init__.py')
-rw-r--r--ick2/__init__.py6
1 files changed, 3 insertions, 3 deletions
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,