From: theStack <sebastian.falbesoner@gmail.com>
Date: Tue, 15 Dec 2009 01:09:04 +0000 (+0100)
Subject: readMHX() now takes filename instead of fp
X-Git-Tag: v0.1~12
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=pyfrprog.git;a=commitdiff_plain;h=66102daf335a37e5a9451416c3c7a77e53b18772

readMHX() now takes filename instead of fp
---

diff --git a/frprog.py b/frprog.py
index d481f89..2522bfd 100755
--- a/frprog.py
+++ b/frprog.py
@@ -113,7 +113,8 @@ class FlashSequence(object):
 		self.address = address
 		self.data = data
 
-def readMHXFile(fp): # needs a file handle to the desired mhx file
+def readMHXFile(filename): # desired mhx filename
+	fp = open(filename, "r")
 	retval = [] # returns a list of FlashSequence objects
 	linecount = 0
 	for line in fp:
@@ -142,6 +143,7 @@ def readMHXFile(fp): # needs a file handle to the desired mhx file
 
 			# add flash sequence to our list
 			retval.append(FlashSequence(address, data))
+	fp.close()
 	return retval
 
 
@@ -152,12 +154,10 @@ if len(sys.argv) != 2:
 
 # read in data from mhx-file before starting
 try:
-	fp = open(sys.argv[1], "r")
-except IOError:
-	print sys.argv[0] + ": Error - couldn't open file " + sys.argv[1] + "!"
+	flashseqs = readMHXFile(sys.argv[1])
+except IOError as error:
+	print sys.argv[0] + ": Error - couldn't open file " + error.filename + "!"
 	sys.exit(1)
-flashseqs = readMHXFile(fp)
-fp.close()
 
 print "The following flash sequences have been read in:"
 for seq in flashseqs: