testtools/source/bridgetest/pyuno/samplecomponent.py | 122 +++++++++----------
uitest/packaging/setup.py | 46 +++----
2 files changed, 84 insertions(+), 84 deletions(-)
New commits:
commit de077efae8265661905a47abb63dbfd6a69e1563
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Sat Nov 23 23:22:05 2019 -0800
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Tue Dec 10 08:43:13 2019 +0100
Fix IdentationError and mixture of spaces and tabs
Fix IdentationError and mixture of spaces and tabs found by
python -m py_compile <file>.
Change-Id: I1dc99196410d736ca33ead5deadfc61bc6584428
Reviewed-on: https://gerrit.libreoffice.org/83594
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.car...@gmx.de>
diff --git a/testtools/source/bridgetest/pyuno/samplecomponent.py
b/testtools/source/bridgetest/pyuno/samplecomponent.py
index 736af9bee858..a434cd0b479c 100644
--- a/testtools/source/bridgetest/pyuno/samplecomponent.py
+++ b/testtools/source/bridgetest/pyuno/samplecomponent.py
@@ -28,10 +28,10 @@ g_implName = "org.openoffice.comp.pyuno.PythonTestObject"
g_attribs = "RuntimeException", "Bool", "Char", "Byte", "Short", "UShort", \
"Long", "ULong", "Hyper", "UHyper", "Float", "Double", "Enum", \
- "String", "Interface", "Any" , "Sequence" , "Struct"
+ "String", "Interface", "Any" , "Sequence" , "Struct"
def assign( rData, bBool, cChar, nByte, nShort, nUShort, nLong, nULong,
nHyper,\
- nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny ):
+ nUHyper, fFloat, fDouble, eEnum, rStr, xTest, rAny ):
rData.Bool = bBool;
rData.Char = cChar;
rData.Byte = nByte;
@@ -50,96 +50,96 @@ def assign( rData, bBool, cChar, nByte, nShort, nUShort,
nLong, nULong, nHyper,\
class MyRecursiveCall( XRecursiveCall, unohelper.Base ):
def callRecursivly( xCall, nToCall ):
- if nToCall:
- xCall.callRecursivly( self, nToCall -1 )
-
+ if nToCall:
+ xCall.callRecursivly( self, nToCall -1 )
+
class SampleUnoComponent( XBridgeTestBase,XServiceInfo ):
def __init__(self,ctx):
- self.__dict__["callid"] = 0
- self.__dict__["sequenceBroken"] = 0
+ self.__dict__["callid"] = 0
+ self.__dict__["sequenceBroken"] = 0
def transportAny( self, value ):
- return value
+ return value
def raiseException( self, ArgumentPosition, Message, Context ):
- raise IllegalArgumentException( Message, Context, ArgumentPosition )
-
+ raise IllegalArgumentException( Message, Context, ArgumentPosition )
+
def raiseRuntimeExceptionOneway(self, Message, Context ):
- raise RuntimeException( Message, Context )
+ raise RuntimeException( Message, Context )
def setValues( self, bBool, cChar, nByte, nShort, nUShort, nLong,\
- nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \
- aString, xInterface, aAny, aSequence, aStruct ):
+ nULong, nHyper, nUHyper, fFloat, fDouble, eEnum, \
+ aString, xInterface, aAny, aSequence, aStruct ):
self.__dict__["data"] = TestDataElements( bBool, cChar, nByte,
nShort, nUShort, nLong,
- nULong, nHyper, nUHyper, fFloat, fDouble, eEnum,
aStruct, xInterface,
- aAny, aSequence )
- self.__dict__["Struct"] = aStruct
+ nULong, nHyper, nUHyper, fFloat, fDouble, eEnum,
aStruct, xInterface,
+ aAny, aSequence )
+ self.__dict__["Struct"] = aStruct
def setValues2( self, bBool, cChar, nByte, nShort, nUShort, nLong,
nULong,\
- nHyper, nUHyper, fFloat, fDouble, eEnum, \
- aString, xInterface, aAny, aSequence, aStruct ):
+ nHyper, nUHyper, fFloat, fDouble, eEnum, \
+ aString, xInterface, aAny, aSequence, aStruct ):
self.__dict__["Struct"] = TestData( cChar, nByte, nShort, nUShort,
nLong, nULong, nHyper,\
- nUHyper, fFloat, fDouble, eEnum,
aStruct, xInterface,\
- aAny, aSequence )
+ nUHyper, fFloat, fDouble, eEnum,
aStruct, xInterface,\
+ aAny, aSequence )
self.__dict__["Struct"] = aStruct
- return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,
nUHyper, nULong, \
- nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,
aAny, \
- (aSequence[1],aSequence[0]), aStruct
-
+ return bBool, cChar, nByte, nShort, nUShort, nLong, nULong, nHyper,
nUHyper, nULong, \
+ nHyper, nUHyper, fFloat, fDouble, eEnum, aStruct, xInterface,
aAny, \
+ (aSequence[1],aSequence[0]), aStruct
+
def getValues(self, a,b,c,d,e,f,g,h, i,j,k,l,m,n):
- v = self.__dict__["data"]
- return self.__dict__["Struct"],v.Bool, v.Char, v.Byte, v.Short,
v.UShort, v.Long, \
- v.ULong, v.Hyper, v.UHyper, v.Float, v.Double, v.Enum,
v.String, v.Interface, \
- v.Any, v.Sequence, self.__dict__["Struct"]
-
+ v = self.__dict__["data"]
+ return self.__dict__["Struct"],v.Bool, v.Char, v.Byte, v.Short,
v.UShort, v.Long, \
+ v.ULong, v.Hyper, v.UHyper, v.Float, v.Double, v.Enum,
v.String, v.Interface, \
+ v.Any, v.Sequence, self.__dict__["Struct"]
+
def call( self, callid, nWaitMUSEC ):
- if self.__dict__["callid"] >= callid:
- self.__dict__["sequenceBroken"] = 1
- else:
- self.__dict__["callid"] = callid
+ if self.__dict__["callid"] >= callid:
+ self.__dict__["sequenceBroken"] = 1
+ else:
+ self.__dict__["callid"] = callid
def callOneway( self, nCallId, nWaitMUSEC ):
- call( nCallId, nWaitMUSEC )
-
+ call( nCallId, nWaitMUSEC )
+
def sequenceOfCallTestPassed():
- return self.__dict__["sequenceBroken"]
+ return self.__dict__["sequenceBroken"]
def startRecursiveCall( xCall , nToCall ):
- if nToCall:
- xCall.callRecursivly( MyRecursiveCall(), nToCall -1 )
+ if nToCall:
+ xCall.callRecursivly( MyRecursiveCall(), nToCall -1 )
def checkExistence( self, name ):
- found = 0
- for x in g_attribs:
- if x == name:
- found = 1
- break
- if not found:
- raise UnknownPropertyException( "Property "+name+" is unknown",
self )
-
+ found = 0
+ for x in g_attribs:
+ if x == name:
+ found = 1
+ break
+ if not found:
+ raise UnknownPropertyException( "Property "+name+" is unknown",
self )
+
def __setattr__( self, name, value ):
- checkExistence( name )
- self.__dict__[name] = value
-
+ checkExistence( name )
+ self.__dict__[name] = value
+
def __getattr__( self, name ):
- checkExistence( name )
- return self.__dict__[name]
+ checkExistence( name )
+ return self.__dict__[name]
def getSupportedServices( self ):
- return g_ImplementationHelper.getSupportedServices(g_implName)
+ return g_ImplementationHelper.getSupportedServices(g_implName)
def supportsService( self, ServiceName ):
- return g_ImplementationHelper.supportsService( g_implName,
ServiceName )
+ return g_ImplementationHelper.supportsService( g_implName,
ServiceName )
def getImplementationName(self):
- return g_implName
+ return g_implName
g_ImplementationHelper.addImplementation( \
-
SampleUnoComponent,g_implName,("com.sun.star.test.bridge.PythonTestObject",),)
-
+
SampleUnoComponent,g_implName,("com.sun.star.test.bridge.PythonTestObject",),)
+
#g_ImplementationEntries = \
-# unohelper.ImplementationEntry( \
-# "org.openoffice.comp.SamplePythonComponent", \
-# ("com.sun.star.test.bridge.PythonTestObject",), \
-# SampleUnoComponent) \
-# ,
+# unohelper.ImplementationEntry( \
+# "org.openoffice.comp.SamplePythonComponent", \
+# ("com.sun.star.test.bridge.PythonTestObject",), \
+# SampleUnoComponent) \
+# ,
diff --git a/uitest/packaging/setup.py b/uitest/packaging/setup.py
index 83d0eccac04b..9aa32054ccc2 100644
--- a/uitest/packaging/setup.py
+++ b/uitest/packaging/setup.py
@@ -6,29 +6,29 @@ here = path.abspath(path.dirname(__file__))
# Get the long description from the README file
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-long_description = f.read()
+ long_description = f.read()
setup(
- name="libreoffice-connection",
- version="0.0.1",
- description="Connection code for LibreOffice's pyUNO",
- long_description=long_description,
- url="http://www.libreoffice.org";,
- author="The LibreOffice developers",
- author_email="libreoffice@lists.freedesktop.org",
- license="MPL2",
- classifiers=[
- "Development Status :: 3 - Alpha",
- "Intended Audience :: Developers",
- "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
- "Programming Language :: Python :: 3.2",
- "Programming Language :: Python :: 3.3",
- "Programming Language :: Python :: 3.4",
- "Programming Language :: Python :: 3.5",
- "Programming Language :: Python :: 3.6",
- "Topic :: Office/Business :: Office Suites",
- "Topic :: Software Development :: Libraries",
- ],
- keywords="office automation",
- packages=find_packages(),
+ name="libreoffice-connection",
+ version="0.0.1",
+ description="Connection code for LibreOffice's pyUNO",
+ long_description=long_description,
+ url="http://www.libreoffice.org";,
+ author="The LibreOffice developers",
+ author_email="libreoffice@lists.freedesktop.org",
+ license="MPL2",
+ classifiers=[
+ "Development Status :: 3 - Alpha",
+ "Intended Audience :: Developers",
+ "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+ "Programming Language :: Python :: 3.2",
+ "Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: 3.4",
+ "Programming Language :: Python :: 3.5",
+ "Programming Language :: Python :: 3.6",
+ "Topic :: Office/Business :: Office Suites",
+ "Topic :: Software Development :: Libraries",
+ ],
+ keywords="office automation",
+ packages=find_packages(),
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
