diff options
| author | Loic Dachary <loic@dachary.org> | 2016-01-28 15:10:03 +0700 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2016-07-25 03:48:33 +0300 |
| commit | 6c0678576aa64251b5a34e04541d4cfd36811f2e (patch) | |
| tree | 27a6c32b633a006017b71121732b8e70032e3079 /mediagoblin/submit/lib.py | |
| parent | d5421cc3666ac0e5802bd9a6e806dca5534d3a88 (diff) | |
| download | mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.tar.lz mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.tar.xz mediagoblin-6c0678576aa64251b5a34e04541d4cfd36811f2e.zip | |
Fix #928 - cleanup to avoid duplicated get_upload_file_limits
Signed-off-by: Loic Dachary <loic@dachary.org>
Diffstat (limited to 'mediagoblin/submit/lib.py')
| -rw-r--r-- | mediagoblin/submit/lib.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index 2edea70f..4979def8 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -103,7 +103,6 @@ class UserPastUploadLimit(UploadLimitError): def submit_media(mg_app, user, submitted_file, filename, title=None, description=None, license=None, metadata=None, tags_string=u"", - upload_limit=None, max_file_size=None, callback_url=None, urlgen=None,): """ Args: @@ -119,12 +118,11 @@ def submit_media(mg_app, user, submitted_file, filename, - license: license for this media entry - tags_string: comma separated string of tags to be associated with this entry - - upload_limit: size in megabytes that's the per-user upload limit - - max_file_size: maximum size each file can be that's uploaded - callback_url: possible post-hook to call after submission - urlgen: if provided, used to do the feed_url update and assign a public ID used in the API (very important). """ + upload_limit, max_file_size = get_upload_file_limits(user) if upload_limit and user.uploaded >= upload_limit: raise UserPastUploadLimit() |