From 80b222902b49af88e709ef4d246e3c3e91623580 Mon Sep 17 00:00:00 2001 From: kliment Date: Thu, 9 Jun 2011 19:03:57 +0200 Subject: [PATCH] Remove dependency on "with" - works with python 2.5 --- pronsole.py | 13 +++++++------ pronterface.py | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pronsole.py b/pronsole.py index 1f23f2a..bf4bede 100644 --- a/pronsole.py +++ b/pronsole.py @@ -180,10 +180,11 @@ class pronsole(cmd.Cmd): def preloop(self): self.processing_rc=True try: - with open(os.path.join(os.path.expanduser("~"),".pronsolerc")) as rc: - for rc_cmd in rc: - if not rc_cmd.lstrip().startswith("#"): - self.onecmd(rc_cmd) + rc=open(os.path.join(os.path.expanduser("~"),".pronsolerc")) + for rc_cmd in rc: + if not rc_cmd.lstrip().startswith("#"): + self.onecmd(rc_cmd) + rc.close() except IOError: pass self.processing_rc=False @@ -768,8 +769,8 @@ class pronsole(cmd.Cmd): print "Skeinforge not found. \nPlease copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file." return if not os.path.exists("skeinforge/__init__.py"): - with open("skeinforge/__init__.py","w"): - pass + f=open("skeinforge/__init__.py","w") + f.close() try: from skeinforge.skeinforge_application.skeinforge_utilities import skeinforge_craft from skeinforge.skeinforge_application import skeinforge diff --git a/pronterface.py b/pronterface.py index c955d56..25c7b35 100644 --- a/pronterface.py +++ b/pronterface.py @@ -218,7 +218,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): self.logbox.SetEditable(0) self.sendbtn=wx.Button(self.panel,-1,"Send",pos=(700,420)) self.sendbtn.Bind(wx.EVT_BUTTON,self.sendline) - self.monitorbox=wx.CheckBox(self.panel,-1,"Monitor printer",pos=(500,40)) + self.monitorbox=wx.CheckBox(self.panel,-1,"Monitor\nprinter",pos=(450,37)) self.monitorbox.Bind(wx.EVT_CHECKBOX,self.setmonitor) self.status=self.CreateStatusBar() self.status.SetStatusText("Not connected to printer.") @@ -462,8 +462,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): print "Skeinforge not found. \nPlease copy Skeinforge into a directory named \"skeinforge\" in the same directory as this file." return if not os.path.exists("skeinforge/__init__.py"): - with open("skeinforge/__init__.py","w"): - pass + f=open("skeinforge/__init__.py","w") + f.close() self.cout=StringIO.StringIO() self.filename=filename self.stopsf=0