github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Missed in rebase: r2/r2/lib/providers/media/s3.py conflict

Browse Source
This commit is contained in:
weffey
2015-05-13 13:40:36 -07:00
parent 8141fc4674
commit 11ecbe6092
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/lib/providers/media/s3.py
View File

@@ -67,9 +67,6 @@ class S3MediaProvider(MediaProvider):
],
}
<<<<<<< HEAD
def put(self, name, contents):
=======
buckets = {
'thumbs': 's3_media_buckets',
'stylesheets': 's3_media_buckets',
@@ -115,7 +112,6 @@ class S3MediaProvider(MediaProvider):
def put(self, category, name, contents):
buckets = getattr(g, self.buckets[category])
>>>>>>> 9f2a8e5... Takedown tool
# choose a bucket based on the filename
name_without_extension = os.path.splitext(name)[0]
index = ord(name_without_extension[-1]) % len(g.s3_media_buckets)