Improve exception on unicode decode failure

djmitche · May 10, 2010 · 684ba07 · 684ba07
1 parent a6839b6
commit 684ba07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/buildbot/db/schema/v1.py b/buildbot/db/schema/v1.py
@@ -280,11 +280,15 @@ def remove_none(x):
                 return x.decode("utf8")
             else:
                 return x
-        values = tuple(remove_none(x) for x in
-                         (change.number, change.who,
-                          change.comments, change.isdir,
-                          change.branch, change.revision, change.revlink,
-                          change.when, change.category))
+        try:
+            values = tuple(remove_none(x) for x in
+                             (change.number, change.who,
+                              change.comments, change.isdir,
+                              change.branch, change.revision, change.revlink,
+                              change.when, change.category))
+        except UnicodeDecodeError:
+            raise UnicodeError("Trying to import change data as UTF-8 failed.  Please look at contrib/fix_changes_pickle_encoding.py")
+
         q = util.sql_insert(self.dbapi, 'changes',
             """changeid author comments is_dir branch revision
                revlink when_timestamp category""".split())

diff --git a/buildbot/test/regressions/test_import_unicode_changes.py b/buildbot/test/regressions/test_import_unicode_changes.py
@@ -55,7 +55,7 @@ def testNonUnicodeChange(self):
             "changes.pck"), "w"))
 
         sm = manager.DBSchemaManager(self.spec, self.basedir)
-        self.assertRaises(UnicodeDecodeError, sm.upgrade)
+        self.assertRaises(UnicodeError, sm.upgrade)
 
     def testAsciiChange(self):
         # Create changes.pck