Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
Reply-To: general@gump.apache.org
Message-ID: <20050616185205.58936.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r190980 -
 /gump/branches/Gump3/pygump/python/gump/engine/loader.py
Date: Thu, 16 Jun 2005 18:52:04 -0000
To: commits@gump.apache.org
From: leosimons@apache.org

Author: leosimons
Date: Thu Jun 16 11:52:03 2005
New Revision: 190980

URL: http://svn.apache.org/viewcvs?rev=3D190980&view=3Drev
Log:
Fix for GUMP-136.

* pygump/python/gump/engine/loader.py: while importing other xml documents,=
 be a little more robust by logging errors during every stage of the import=
 process (without exiting) instead of just during the download.

Modified:
    gump/branches/Gump3/pygump/python/gump/engine/loader.py

Modified: gump/branches/Gump3/pygump/python/gump/engine/loader.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/e=
ngine/loader.py?rev=3D190980&r1=3D190979&r2=3D190980&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/pygump/python/gump/engine/loader.py (original)
+++ gump/branches/Gump3/pygump/python/gump/engine/loader.py Thu Jun 16 11:5=
2:03 2005
@@ -83,26 +83,26 @@
    =20
     try:
         stream =3D download_func(href)
+
+        new_dom =3D minidom.parse(stream)
+        new_dom.normalize()
+        stream.close() # close file immediately, we're done!
+        new_root =3D new_dom.documentElement
+       =20
+        # we succeeded loading the new document, get rid of the href, save=
 it
+        # as "resolved"
+        node.removeAttribute('href')
+        node.setAttribute('resolved-from-href', href)
+       =20
+        _import_node(node, new_root)
+       =20
+        # we're done with the file now, allow GC
+        new_root.unlink()
     except Exception, details:
         # swallow this in interest of log readability
         #_drop_module_or_project(node, dropped_nodes)
         error_func(href, node, dropped_nodes)
-        return # make sure to stop processing...
    =20
-    new_dom =3D minidom.parse(stream)
-    new_dom.normalize()
-    stream.close() # close file immediately, we're done!
-    new_root =3D new_dom.documentElement
-   =20
-    # we succeeded loading the new document, get rid of the href, save it
-    # as "resolved"
-    node.removeAttribute('href')
-    node.setAttribute('resolved-from-href', href)
-   =20
-    _import_node(node, new_root)
-   =20
-    # we're done with the file now, allow GC
-    new_root.unlink()
=20
 ###
 ### Classes