additional tweaks for python2

Author: johnbradley

ddsc/core/download.py

@@ -278,8 +278,9 @@ def _print_path_filter_warnings(self):
 
     def _download_file(self, pool, project_file):
         output_path = project_file.get_local_path(self.dest_directory)
-        if not os.path.exists(output_path):
-            os.makedirs(os.path.dirname(output_path))
+        output_path_parent = os.path.dirname(output_path)
+        if not os.path.exists(output_path_parent):
+            os.makedirs(output_path_parent)
         file_download_state = FileDownloadState(project_file, output_path, self.config)
         self._async_download_file(pool, file_download_state)
 
@@ -322,6 +323,7 @@ def show_progress_bar(self):
             files_downloaded,
             self.files_to_download
         ))
+        sys.stdout.flush()
 
     def make_spinner_char(self, current_time):
         half_seconds = int(current_time)

ddsc/core/tests/test_download.py

@@ -396,6 +396,7 @@ def test_download_file(self, mock_file_download_state, mock_os, mock_multiproces
                                                         path_filter=None)
         project_file_downloader._download_file(mock_pool, mock_project_file)
         mock_os.path.dirname.assert_called_with("/tmp/data.out")
+        mock_os.path.exists.assert_called_with(mock_os.path.dirname.return_value)
         mock_os.makedirs.assert_called_with(mock_os.path.dirname.return_value)
         mock_file_download_state.assert_called_with(mock_project_file, '/tmp/data.out', self.config)
         mock_pool.apply_async.assert_called_with(download_file, (mock_file_download_state.return_value,
@@ -474,6 +475,7 @@ def test_show_progress_bar(self, mock_time, mock_sys, mock_multiprocessing):
         downloader.get_download_progress.return_value = (10, 1000)
         downloader.show_progress_bar()
         mock_sys.stdout.write.assert_called_with('\r| downloaded 1 KB @ 10 B/s          (10 of 20 files complete)')
+        mock_sys.stdout.flush.assert_called_with()
 
     @patch('ddsc.core.download.multiprocessing')
     def test_make_spinner_char(self, mock_multiprocessing):