Whitespace and formatting cleanup.
* Removed trailing whitespace * Line length < 80 where possible * Honor conventions on number of blank lines * Honor conventions about spaces around :, =
This commit is contained in:
@@ -13,5 +13,3 @@
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
|
||||
from mimetypes import guess_type
|
||||
|
||||
|
||||
ALLOWED = ['image/jpeg', 'image/png', 'image/tiff', 'image/gif']
|
||||
|
||||
|
||||
def check_filetype(posted_file):
|
||||
if not guess_type(posted_file.filename)[0] in ALLOWED:
|
||||
return False
|
||||
|
||||
@@ -61,8 +61,8 @@ def submit_start(request):
|
||||
entry['description'] = unicode(request.POST.get('description'))
|
||||
entry['description_html'] = cleaned_markdown_conversion(
|
||||
entry['description'])
|
||||
|
||||
entry['media_type'] = u'image' # heh
|
||||
|
||||
entry['media_type'] = u'image' # heh
|
||||
entry['uploader'] = request.user['_id']
|
||||
|
||||
# Process the user's folksonomy "tags"
|
||||
@@ -90,8 +90,10 @@ def submit_start(request):
|
||||
|
||||
# We generate this ourselves so we know what the taks id is for
|
||||
# retrieval later.
|
||||
# (If we got it off the task's auto-generation, there'd be a risk of
|
||||
# a race condition when we'd save after sending off the task)
|
||||
|
||||
# (If we got it off the task's auto-generation, there'd be
|
||||
# a risk of a race condition when we'd save after sending
|
||||
# off the task)
|
||||
task_id = unicode(uuid.uuid4())
|
||||
entry['queued_task_id'] = task_id
|
||||
|
||||
@@ -113,8 +115,8 @@ def submit_start(request):
|
||||
# expect a lot of users to run things in this way we have to
|
||||
# capture stuff here.
|
||||
#
|
||||
# ... not completely the diaper pattern because the exception is
|
||||
# re-raised :)
|
||||
# ... not completely the diaper pattern because the
|
||||
# exception is re-raised :)
|
||||
mark_entry_failed(entry[u'_id'], exc)
|
||||
# re-raise the exception
|
||||
raise
|
||||
@@ -122,7 +124,7 @@ def submit_start(request):
|
||||
add_message(request, SUCCESS, _('Woohoo! Submitted!'))
|
||||
|
||||
return redirect(request, "mediagoblin.user_pages.user_home",
|
||||
user = request.user['username'])
|
||||
user=request.user['username'])
|
||||
|
||||
return render_to_response(
|
||||
request,
|
||||
|
||||
Reference in New Issue
Block a user