Skip to content

Commit

Permalink
Fix os.rename from gensim.downloader when src and dst on different pa…
Browse files Browse the repository at this point in the history
…rtitions (#1733)

* Fix typo

* Make `save_corpus` private

* Annotate `bleicorpus.py`

* Make __save_corpus weakly private

* Fix _save_corpus[2]

* Document bleicorpus in Numpy style

* Fix tests on Arch Linux

* Revert "Document bleicorpus in Numpy style"

This reverts commit 04c2e61.

* Revert "Fix _save_corpus[2]"

This reverts commit 3b55037.

* Revert "Make __save_corpus weakly private"

This reverts commit 34bd9ef.

* Revert "Annotate `bleicorpus.py`"

This reverts commit 34cccfe.

* Revert "Make `save_corpus` private"

This reverts commit cde582e.

* Revert "Fix typo"

This reverts commit 3cc34ff.

* Handle the multiple partitions case
  • Loading branch information
anotherbugmaster authored and menshikh-iv committed Nov 23, 2017
1 parent 5bb6eab commit 1980109
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions gensim/downloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def _download(name):
"""
url_load_file = "{base}/{fname}/__init__.py".format(base=DOWNLOAD_BASE_URL, fname=name)
data_folder_dir = os.path.join(base_dir, name)
data_folder_dir_tmp = data_folder_dir + '_tmp'
tmp_dir = tempfile.mkdtemp()
init_path = os.path.join(tmp_dir, "__init__.py")
urllib.urlretrieve(url_load_file, init_path)
Expand Down Expand Up @@ -310,7 +311,6 @@ def _download(name):
with open(part_path, "rb") as rfp:
shutil.copyfileobj(rfp, wfp)
os.remove(part_path)
os.rename(tmp_dir, data_folder_dir)
else:
url_data = "{base}/{fname}/{fname}.gz".format(base=DOWNLOAD_BASE_URL, fname=name)
fname = "{fname}.gz".format(fname=name)
Expand All @@ -323,7 +323,12 @@ def _download(name):
else:
shutil.rmtree(tmp_dir)
raise Exception("Checksum comparison failed, try again")
os.rename(tmp_dir, data_folder_dir)

if os.path.exists(data_folder_dir_tmp):
os.remove(data_folder_dir_tmp)

shutil.move(tmp_dir, data_folder_dir_tmp)
os.rename(data_folder_dir_tmp, data_folder_dir)


def _get_filename(name):
Expand Down

0 comments on commit 1980109

Please sign in to comment.