Pull requests

#77 Open
Repository
syphar
Branch
fix_listdir_with_colon_file
Repository
david
Branch
default

S3Boto: save_join spared the base_path if added path was a single file and contained a colon

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r fix_listdir_with_colon_file https://bitbucket.org/syphar/django-storages
hg merge fix_listdir_with_colon_file
hg commit -m 'Merged in syphar/django-storages/fix_listdir_with_colon_file (pull request #77)'
Author
  1. syphar
Reviewers
Description

Problem is: try S3BotoStorage.listdir with AWS_LOCATION defined.

Until now, "urljoin" was used to merge these to path-parts, but when there is a colon in the folder-name, urljoin thinks this is a url-schema...

This is my idea to solve it, comments or better ideas are welcome.

Tests are green of course.

  • Learn about pull requests

Comments (2)