Attachment 82883 Details for Bug 66025 – Import handler patch

[patch] Import handler patch

uno.py.patch (text/plain), 2.86 KB, created by David Bolen on 2013-07-23 23:37:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Bolen

Created: 2013-07-23 23:37:55 UTC

Size: 2.86 KB

patch

obsolete

>--- uno.py.orig	2013-07-22 15:16:52.891453394 -0400
>+++ uno.py.new	2013-07-23 19:02:49.469756693 -0400
>@@ -263,7 +263,7 @@
>     try:
> #       print "optargs = " + repr(optargs)
>         return _g_delegatee( name, *optargs, **kwargs )
>-    except ImportError:
>+    except ImportError as e:
>         # process optargs
>         globals, locals, fromlist = list(optargs)[:3] + [kwargs.get('globals',{}), kwargs.get('locals',{}), kwargs.get('fromlist',[])][len(optargs):]
>         if not fromlist:
>@@ -279,28 +279,51 @@
>         d = mod.__dict__
> 
>     RuntimeException = pyuno.getClass( "com.sun.star.uno.RuntimeException" )
>+    unknown = object() # unknown/missing sentinel
>     for x in fromlist:
>        if x not in d:
>+          d[x] = unknown
>           if x.startswith( "typeOf" ):
>              try: 
>                 d[x] = pyuno.getTypeByName( name + "." + x[6:len(x)] )
>-             except RuntimeException as e:
>-                raise ImportError( "type " + name + "." + x[6:len(x)] +" is unknown" )
>+             except RuntimeException:
>+                pass
>           else:
>             try:
>                 # check for structs, exceptions or interfaces
>                 d[x] = pyuno.getClass( name + "." + x )
>-            except RuntimeException as e:
>+            except RuntimeException:
>                 # check for enums 
>                 try:
>                    d[x] = Enum( name , x )
>-                except RuntimeException as e2:
>+                except RuntimeException:
>                    # check for constants
>                    try:
>                       d[x] = getConstantByName( name + "." + x )
>-                   except RuntimeException as e3:
>-                      # no known uno type !
>-                      raise ImportError( "type "+ name + "." +x + " is unknown" )
>+                   except RuntimeException:
>+                      pass
>+
>+          if d[x] is unknown:
>+             # Remove unknown placeholder we created
>+             del d[x]
>+
>+             # This can be a bad uno reference, or it can just result from any
>+             # python import failure (in a "from xxx import yyy" statement).
>+             # Synthesize a general purpose exception, reusing the original
>+             # traceback to provide information for either case.  We don't use
>+             # the original python exception as uno failures will typically
>+             # just reflect a missing top level module (such as "com").
>+
>+             # Note that we raise this outside of the nested exception handlers
>+             # above, or otherwise Python 3 will generate additional tracebacks
>+             # for each of the nested exceptions.
>+
>+             e = ImportError("No module named '%s' or '%s.%s' is unknown" %
>+                             (name, name, x))
>+             e.__traceback__ = sys.exc_info()[2]
>+
>+             raise e
>+
>     return mod
> 
> # private function, don't use

Actions: View | Splinter Review

Attachments on bug 66025: 81214 | 81215 | 82636 | 82883 | 82884 | 82885 | 82905 | 82928 | 83056 | 83058

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.