Changeset 4446

Timestamp:

04/05/09 15:14:47 (4 years ago)

Author:

gpolo

Message:

Be more explicit about missing files.

Location:

trunk/umit/merger

Files:

• errors.py (added)
• merge_ini.py (modified) (3 diffs)
• sqlitedb.py (modified) (2 diffs)
• tests/test_sqlitemerge.py (modified) (1 diff)

trunk/umit/merger/merge_ini.py

@@ -2 +2 @@
 import shutil
 import ConfigParser
+
+from umit.merger.errors import OriginError, DestinationError
 
 def merge(from_file, to_file):
@@ -9 +11 @@
     @return true or false
     """
-    if not os.path.exists(from_file) or not os.path.exists(to_file):
-        return False
+    if not os.path.exists(from_file):
+        raise OriginError(from_file)
+    if not os.path.exists(to_file):
+        raise DestinationError(to_file)
 
     # Read new file
@@ -43 +47 @@
         config.write(f)
 
-    return True
-
 def copy_section(config, config_new, section):
     config.add_section(section)

trunk/umit/merger/sqlitedb.py

@@ -9 +9 @@
 except ImportError:
     from pysqlite2 import dbapi2 as sqlite
+
+from umit.merger.errors import OriginError, DestinationError
 
 def _dict_factory(cursor, row):
@@ -154 +156 @@
 
     def _merge(self):
+        if not os.path.isfile(self._fromdb):
+            raise OriginError("%r is not a file." % self._fromdb)
+
         new = sqlite.connect(self._fromdb)
         self._fromcursor = new_cursor = new.cursor(_DictCursor)
 
         if not os.path.isfile(self._todb):
-            raise Exception("The older db %r is not a file." % self._todb)
+            raise DestinationError("%r is not a file." % self._todb)
 
         old = sqlite.connect(self._todb)

trunk/umit/merger/tests/test_sqlitemerge.py

@@ -3 +3 @@
 from test.test_support import run_unittest
 
-from sqlitedb import sqlite, merge, column_definitions, _DictCursor
+from umit.merger.sqlitedb import sqlite, merge, column_definitions, _DictCursor
 
 def conn_cursor(name):