Restructured try/except block

sheran · Oct 17, 2011 · 3fcdc15 · 3fcdc15
1 parent 4bf25a3
commit 3fcdc15
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/bbtmodules/DatFile.py b/bbtmodules/DatFile.py
@@ -51,15 +51,16 @@ def record(self,offset,record_id):
 		try:
 			header_data.append(self.dat_file.read(header[2]))
 			header_data.append(self.dat_file.read(header[3]))
+			data = self.dat_file.read(header[4])
+			if record_id == header[1].encode("hex").upper():
+				return Record(header, header_data, data)
+			else:
+				return None
 		except OverflowError:
 			return None
 		except MemoryError:
 			return None
-		data = self.dat_file.read(header[4])
-		if record_id == header[1].encode("hex").upper():
-			return Record(header, header_data, data)
-		else:
-			return None
+
 
 	def close(self):
 		self.dat_file.close()