diff options
author | Pedro Giffuni <pfg@apache.org> | 2012-12-15 16:42:09 +0000 |
---|---|---|
committer | Pedro Giffuni <pfg@apache.org> | 2012-12-15 16:42:09 +0000 |
commit | 881160d0e10ff5202b19045be4e65d41833ab42a (patch) | |
tree | f4f99f84d1fbc1ffa6f9b36517e1003d3d034e91 /pyuno | |
parent | 613c8044fd9af3d1820c293bd95d12b700177405 (diff) |
Partial revert of r1419529.
The builtin hack was incorrect.
Reported by : hanya
Notes
Notes:
prefer: 4634cbc237239da771e0f6a81f78171ecec726ba
Diffstat (limited to 'pyuno')
-rw-r--r-- | pyuno/source/module/uno.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py index 72957ca4ec27..c40dac7a07fb 100644 --- a/pyuno/source/module/uno.py +++ b/pyuno/source/module/uno.py @@ -21,11 +21,7 @@ import sys import pyuno - -try: - import __builtin__ as builtin -except ImportError: - import builtins +import __builtin__ try: unicode @@ -37,7 +33,7 @@ import socket # since on Windows sal3.dll no longer calls WSAStartup # all functions and variables starting with a underscore (_) must be considered private # and can be changed at any time. Don't use them _g_ctx = pyuno.getComponentContext( ) -_g_delegatee = builtin.__dict__["__import__"] +_g_delegatee = __builtin__.__dict__["__import__"] def getComponentContext(): """ returns the UNO component context, that was used to initialize the python runtime. @@ -282,7 +278,7 @@ def _uno_import( name, *optargs, **kwargs ): return mod # hook into the __import__ chain -builtin.__dict__["__import__"] = _uno_import +__builtin__.__dict__["__import__"] = _uno_import # private, referenced from the pyuno shared library def _uno_struct__init__(self,*args): @@ -293,11 +289,11 @@ def _uno_struct__init__(self,*args): # private, referenced from the pyuno shared library def _uno_struct__getattr__(self,name): - return builtin.getattr(self.__dict__["value"],name) + return __builtin__.getattr(self.__dict__["value"],name) # private, referenced from the pyuno shared library def _uno_struct__setattr__(self,name,value): - return builtin.setattr(self.__dict__["value"],name,value) + return __builtin__.setattr(self.__dict__["value"],name,value) # private, referenced from the pyuno shared library def _uno_struct__repr__(self): |