Moved properties.py and settings_object.py to libbe/storage/util/

diff --git a/libbe/bug.py b/libbe/bug.py
index 7bb52bc14792bbc010293d81eca317f82a44286f..84eb1ed03657abc62de166a22f21dd7bcea6cd4f 100644 (file)
--- 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 cf4274769ca52371d1a37023394f1f394c4c2600..44356243beeca8378ec413e628c1f1e8b29acd41 100644 (file)
--- 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 e77235a0879596d0b0ec92882406f0103e1481a6..987e39c658a82f2d83a5d6288dec6f11d6b90c28 100644 (file)
--- 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 (file)
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