Fix bug in fingerprint with filename.

This wasn't working correctly and had been missed as we were not
covering a line.

Author: drvinceknight

axelrod/fingerprint.py

@@ -258,15 +258,13 @@ def fingerprint(self, turns=50, repetitions=10, step=0.01, processes=None,
 
         if on_windows and (filename is None):  # pragma: no cover
             in_memory = True
-        elif filename is not None:
-            outputfile = open(filename, 'w')
-            filename = outputfile.name
-        else:
+        elif filename is None:
             outputfile = NamedTemporaryFile(mode='w')
             filename = outputfile.name
 
         edges, tourn_players = self.construct_tournament_elements(
             step, progress_bar=progress_bar)
+
         self.step = step
         self.spatial_tournament = axl.SpatialTournament(
             tourn_players,

axelrod/tests/unit/test_fingerprint.py

@@ -110,6 +110,15 @@ def test_progress_bar_fingerprint(self):
                               progress_bar=True)
         self.assertEqual(sorted(data.keys()), self.expected_points)
 
+    def test_fingerprint_with_filename(self):
+        filename = "test_outputs/test_fingerprint.csv"
+        af = AshlockFingerprint(self.strategy, self.probe)
+        af.fingerprint(turns=1, repetitions=1, step=0.5, progress_bar=False,
+                       filename=filename)
+        with open(filename, 'r') as out:
+            data = out.read()
+            self.assertEqual(len(data.split("\n")), 10)
+
     def test_in_memory_fingerprint(self):
         af = AshlockFingerprint(self.strategy, self.probe)
         af.fingerprint(turns=10, repetitions=2, step=0.5, progress_bar=False,

axelrod/tests/unit/test_tournament.py

@@ -89,7 +89,7 @@ def test_warning(self):
             repetitions=1)
         with warnings.catch_warnings(record=True) as w:
             # Check that a warning is raised if no results set is built and no
-            # filename given
+            # filename not given
             results = tournament.play(build_results=False, progress_bar=False)
             self.assertEqual(len(w), 1)