diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 15:32:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 15:32:05 +0100 |
| commit | adb9cbff1f6c380bfae85e7dd96ff6cff22ffbe9 (patch) | |
| tree | b7a69bf8b34a846c2aa6174f980cb13c24823c39 | |
| parent | 07544ac6c4f426db76bf70eb10e4fd4c6ae4a234 (diff) | |
python macros aren't listed under scripting organize
since...
commit deb989dd6d1f86e74864131be50ed92d8d43768c
Author: Kenneth Koski <mechaxl@gmail.com>
Date: Mon Feb 29 22:22:10 2016 -0600
blew away the uno.ByteSequence(str) path
Change-Id: I8b73883c4f246ebafd2f810ca61b19da40f833e2
| -rw-r--r-- | scripting/source/pyprov/pythonscript.py | 5 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/core.py | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index a2fc4f055a10..e4d6a2e965b5 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -153,7 +153,7 @@ g_implName = "org.libreoffice.pyuno.LanguageScriptProviderFor"+LANGUAGENAME BLOCK_SIZE = 65536 def readTextFromStream( inputStream ): # read the file - code = uno.ByteSequence( "" ) + code = uno.ByteSequence( b"" ) while True: read,out = inputStream.readBytes( None , BLOCK_SIZE ) code = code + out @@ -549,9 +549,8 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , XPropertySet, XInvocation, elif event.ActionCommand == "Save": toWrite = uno.ByteSequence( - str( self.editor.getControl("EditorTextField").getText().encode( - sys.getdefaultencoding())) ) + sys.getdefaultencoding()) ) copyUrl = self.uri + ".orig" self.provCtx.sfa.move( self.uri, copyUrl ) out = self.provCtx.sfa.openFileWrite( self.uri ) diff --git a/testtools/source/bridgetest/pyuno/core.py b/testtools/source/bridgetest/pyuno/core.py index b45e10f78d88..c56e9f144df8 100644 --- a/testtools/source/bridgetest/pyuno/core.py +++ b/testtools/source/bridgetest/pyuno/core.py @@ -336,10 +336,10 @@ class TestCase( unittest.TestCase): self.failUnlessRaises( (RuntimeException), uno.getConstantByName, "com.sun.star.uno.XInterface" ) def testByteSequence( self ): - s = uno.ByteSequence( "ab" ) - self.failUnless( s == uno.ByteSequence( "ab" ) ) - self.failUnless( uno.ByteSequence( "abc" ) == s + uno.ByteSequence( "c" ) ) - self.failUnless( uno.ByteSequence( "abc" ) == s + "c" ) + s = uno.ByteSequence( b"ab" ) + self.failUnless( s == uno.ByteSequence( b"ab" ) ) + self.failUnless( uno.ByteSequence( b"abc" ) == s + uno.ByteSequence( b"c" ) ) + self.failUnless( uno.ByteSequence( b"abc" ) == s + "c" ) self.failUnless( s + "c" == "abc" ) self.failUnless( s == uno.ByteSequence( s ) ) self.failUnless( s[0] == 'a' ) |