From d2a20c19491482807a4e8c9d49d367ee4e5952c6 Mon Sep 17 00:00:00 2001
From: Mike Naberezny <mike@naberezny.com>
Date: Sat, 11 Sep 2010 17:05:22 -0700
Subject: [PATCH] Fixed two monitor tests that were broken under Windows.

---
 CHANGES.txt                    |  3 +++
 src/py65/tests/test_monitor.py | 42 ++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index eb64f6f..4613031 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
 0.9-dev *Next Release*
 
+  - Fixed two monitor tests that were broken under Windows.  Thanks 
+    to Oscar Lindberg for reporting this.
+
   - Removed use of defaultdict to fix compatibility with Python 2.4.
 
 0.8 (2010-03-08)
diff --git a/src/py65/tests/test_monitor.py b/src/py65/tests/test_monitor.py
index 761f3e4..c266287 100644
--- a/src/py65/tests/test_monitor.py
+++ b/src/py65/tests/test_monitor.py
@@ -246,15 +246,18 @@ class MonitorTests(unittest.TestCase):
         stdout = StringIO()
         mon = Monitor(stdout=stdout)
 
-        f = tempfile.NamedTemporaryFile()
-        f.write(chr(0xAA) + chr(0xBB) + chr(0xCC)) 
-        f.flush()
-        
-        mon.do_load("'%s' a600" % f.name)
-        self.assertEqual([0xAA, 0xBB, 0xCC], mon._mpu.memory[0xA600:0xA603])
-        self.assertEqual('Wrote +3 bytes from $a600 to $a602\n',
-                         stdout.getvalue())
-        f.close()                     
+        filename = tempfile.mktemp()
+        try:
+            f = open(filename, 'wb')
+            f.write(chr(0xAA) + chr(0xBB) + chr(0xCC)) 
+            f.close()                     
+
+            mon.do_load("'%s' a600" % filename)
+            self.assertEqual('Wrote +3 bytes from $a600 to $a602\n',
+                             stdout.getvalue())
+            self.assertEqual([0xAA, 0xBB, 0xCC], mon._mpu.memory[0xA600:0xA603])
+        finally:
+            os.unlink(filename)
 
     def test_help_load(self):
         stdout = StringIO()
@@ -506,14 +509,19 @@ class MonitorTests(unittest.TestCase):
         mon = Monitor(stdout=stdout)
         mon._mpu.memory[0:3] = [0xAA, 0xBB, 0xCC]
 
-        f = tempfile.NamedTemporaryFile()
-        mon.do_save("'%s' 0 2" % f.name)
-        f.seek(0)
-        self.assertEqual(chr(0xAA) + chr(0xBB) + chr(0xCC),
-                         f.read())
-        self.assertEqual('Saved +3 bytes to %s\n' % f.name, 
-                         stdout.getvalue())
-        f.close()                     
+        filename = tempfile.mktemp()
+        try:
+            mon.do_save("'%s' 0 2" % filename)
+            self.assertEqual('Saved +3 bytes to %s\n' % filename, 
+                             stdout.getvalue())
+
+            f = open(filename, 'rb')
+            contents = f.read()
+            f.close()
+            self.assertEqual(chr(0xAA) + chr(0xBB) + chr(0xCC),
+                             contents)
+        finally:
+            os.unlink(filename)
 
     def test_help_save(self):
         stdout = StringIO()