[Checkins] SVN: zodbupgrade/trunk/src/zodbupgrade/ Cleanup, refactor main method.

[Christian Theune]

Log message for revision 100954:
  Cleanup, refactor main method.
  

Changed:
  U   zodbupgrade/trunk/src/zodbupgrade/analyze.py
  U   zodbupgrade/trunk/src/zodbupgrade/main.py

-=-
Modified: zodbupgrade/trunk/src/zodbupgrade/analyze.py
===================================================================
--- zodbupgrade/trunk/src/zodbupgrade/analyze.py	2009-06-15 06:24:22 UTC (rev 100953)
+++ zodbupgrade/trunk/src/zodbupgrade/analyze.py	2009-06-15 06:24:37 UTC (rev 100954)
@@ -26,11 +26,6 @@
 logger = logging.getLogger('zodbupgrade')
 
 
-class MissingClasses(ValueError):
-    pass
-
-
-
 class Updater(object):
     """Update class references for all current objects in a storage."""
 
@@ -109,9 +104,3 @@
         # XXX Log for later reuse
         new_arg = '%s %s' % (factory.__module__, factory.__name__)
         return code, new_arg
-
-
-
-def main(storage, **kw):
-    updater = Updater(storage, **kw)
-    updater()

Modified: zodbupgrade/trunk/src/zodbupgrade/main.py
===================================================================
--- zodbupgrade/trunk/src/zodbupgrade/main.py	2009-06-15 06:24:22 UTC (rev 100953)
+++ zodbupgrade/trunk/src/zodbupgrade/main.py	2009-06-15 06:24:37 UTC (rev 100954)
@@ -55,9 +55,5 @@
     logging.getLogger().addHandler(logging.StreamHandler())
     logging.getLogger().setLevel(level)
 
-    try:
-        zodbupgrade.analyze.update_storage(
-            storage, options.ignore_missing, options.dry_run)
-    except zodbupgrade.analyze.MissingClasses, e:
-        for class_ in e.args[0]:
-            zodbupgrade.analyze.logger.error('Missing class: %s' % class_)
+    upgrader = zodbupgrade.analyze.Upgrader(storage)
+    upgrader()