Author: pfg
Date: Sat Dec 15 17:42:09 2012
New Revision: 1422299
URL: http://svn.apache.org/viewvc?rev=1422299&view=rev
Log:
Partial revert of r1419529.
The builtin hack was incorrect.
Reported by : hanya
Modified:
openoffice/trunk/main/pyuno/source/module/uno.py
Modified: openoffice/trunk/main/pyuno/source/module/uno.py
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/source/module/uno.py?rev=1422299&r1=1422298&r2=1422299&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/source/module/uno.py (original)
+++ openoffice/trunk/main/pyuno/source/module/uno.py Sat Dec 15 17:42:09 2012
@@ -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.dl
# 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, **kwarg
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):
