From 79154201c1c012063aa3fe1881ff06a3f239fdc5 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 8 Dec 2009 09:01:26 -0500 Subject: [PATCH] Moved properties.py and settings_object.py to libbe/storage/util/ --- libbe/bug.py | 4 ++-- libbe/bugdir.py | 8 ++++---- libbe/comment.py | 4 ++-- libbe/storage/__init__.py | 13 +++++++++++++ libbe/storage/{ => util}/properties.py | 0 libbe/storage/{ => util}/settings_object.py | 0 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 libbe/storage/__init__.py rename libbe/storage/{ => util}/properties.py (100%) rename libbe/storage/{ => util}/settings_object.py (100%) diff --git a/libbe/bug.py b/libbe/bug.py index 7bb52bc..84eb1ed 100644 --- a/libbe/bug.py +++ b/libbe/bug.py @@ -34,8 +34,8 @@ import xml.sax.saxutils import libbe import libbe.util.id -from libbe.storage.properties import Property, doc_property, local_property, \ - defaulting_property, checked_property, cached_property, \ +from libbe.storage.util.properties import Property, doc_property, + local_property, defaulting_property, checked_property, cached_property, \ primed_property, change_hook_property, settings_property import libbe.storage.settings_object as settings_object import libbe.storage.util.mapfile as mapfile diff --git a/libbe/bugdir.py b/libbe/bugdir.py index cf42747..4435624 100644 --- a/libbe/bugdir.py +++ b/libbe/bugdir.py @@ -32,10 +32,10 @@ import time import libbe import libbe.util.encoding as encoding import libbe.storage as storage -from libbe.storage.properties import Property, doc_property, local_property, \ - defaulting_property, checked_property, fn_checked_property, \ - cached_property, primed_property, change_hook_property, \ - settings_property +from libbe.storage.util.properties import Property, doc_property, + local_property, defaulting_property, checked_property, \ + fn_checked_property, cached_property, primed_property, \ + change_hook_property, settings_property import libbe.storage.settings_object as settings_object import libbe.storage.util.mapfile as mapfile import libbe.bug as bug diff --git a/libbe/comment.py b/libbe/comment.py index e77235a..987e39c 100644 --- a/libbe/comment.py +++ b/libbe/comment.py @@ -34,8 +34,8 @@ import xml.sax.saxutils import libbe import libbe.util.id -from libbe.storage.properties import Property, doc_property, local_property, \ - defaulting_property, checked_property, cached_property, \ +from libbe.storage.util.properties import Property, doc_property, + local_property, defaulting_property, checked_property, cached_property, \ primed_property, change_hook_property, settings_property import libbe.storage.settings_object as settings_object import libbe.storage.util.mapfile as mapfile diff --git a/libbe/storage/__init__.py b/libbe/storage/__init__.py new file mode 100644 index 0000000..9c954ee --- /dev/null +++ b/libbe/storage/__init__.py @@ -0,0 +1,13 @@ +# Copyright + +import base + +ConnectionError = base.ConnectionError +InvalidID = base.InvalidID +InvalidRevision = base.InvalidRevision +NotWriteable = base.NotWriteable +NotReadable = base.NotReadable +EmptyCommit = base.EmptyCommit + +__all__ = [ConnectionError, InvalidID, InvalidRevision, + NotWriteable, NotReadable, EmptyCommit] diff --git a/libbe/storage/properties.py b/libbe/storage/util/properties.py similarity index 100% rename from libbe/storage/properties.py rename to libbe/storage/util/properties.py diff --git a/libbe/storage/settings_object.py b/libbe/storage/util/settings_object.py similarity index 100% rename from libbe/storage/settings_object.py rename to libbe/storage/util/settings_object.py -- 2.26.2