Use pop() instead of del to delete keys from the self.modules
dictionary for Python scripts, so KeyError isn't thrown when the
key is missing.

Remove the saving to temporary files, it's not used for any
other scripting language, and can cause bugs when the temporary
files already exist from previous errors.

Patch by: me

main/scripting/source/pyprov/pythonscript.py

diff --git a/main/scripting/source/pyprov/pythonscript.py b/main/scripting/source/pyprov/pythonscript.py
index 9f4fb56..677ff90 100644
--- a/main/scripting/source/pyprov/pythonscript.py
+++ b/main/scripting/source/pyprov/pythonscript.py
@@ -508,7 +508,7 @@
     # with all zeroes, and even if it worked, the smallest granularity for ZIP file
     # timestamps is 2 seconds, which isn't good enough.
     def removeModuleByUrl( self, url ):
-        del self.modules[ url ]
+        self.modules.pop( url, None )
 
 def createEditorDialog( ctx ):
     smgr = ctx.ServiceManager
@@ -675,12 +675,9 @@
             elif event.ActionCommand == "Save":
                 toWrite = uno.ByteSequence(
                     self.editor.getControl("EditorTextField").getText().encode("utf-8"))
-                copyUrl = self.uri() + ".orig"
-                self.provCtx.sfa.move( self.uri(), copyUrl )
                 log.debug( "Saving Python macro to URI " + self.uri() )
                 self.provCtx.sfa.writeFile( self.uri(), BytesInputStream( toWrite.value ) )
                 self.provCtx.removeModuleByUrl( self.uri() )
-                self.provCtx.sfa.kill( copyUrl )
         except Exception as e:
             # TODO: add an error box here !
             log.error( lastException2String() )
@@ -839,12 +836,9 @@
             elif event.ActionCommand == "Save":
                 toWrite = uno.ByteSequence(
                     self.editor.getControl("EditorTextField").getText().encode("utf-8"))
-                copyUrl = self.uri() + ".orig"
-                self.provCtx.sfa.move( self.uri(), copyUrl )
                 log.debug( "Saving Python macro to URI " + self.uri() )
                 self.provCtx.sfa.writeFile( self.uri(), BytesInputStream( toWrite.value ) )
                 self.provCtx.removeModuleByUrl( self.uri() )
-                self.provCtx.sfa.kill( copyUrl )
         except Exception as e:
             # TODO: add an error box here !
             log.error( lastException2String() )