From fc11502916c9b470468b166814c960818de3499e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 21 Mar 2016 15:18:41 +0100 Subject: [PATCH] Sorted imports. Personally I don't care much about this, but after certain refactor operations PyCharm sorts the imports anyway, making the actual refactoring harder to spot. --- pillar/application/modules/file_storage.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pillar/application/modules/file_storage.py b/pillar/application/modules/file_storage.py index 77795aa6..c4fa2571 100644 --- a/pillar/application/modules/file_storage.py +++ b/pillar/application/modules/file_storage.py @@ -5,23 +5,23 @@ from multiprocessing import Process import bson.tz_util from bson import ObjectId -from flask import request +from eve.methods.patch import patch_internal +from eve.methods.put import put_internal from flask import Blueprint from flask import jsonify +from flask import request from flask import send_from_directory from flask import url_for, helpers -from eve.methods.put import put_internal -from eve.methods.patch import patch_internal from application import app from application.utils import remove_private_keys +from application.utils.cdn import hash_file_path +from application.utils.encoding import Encoder +from application.utils.gcs import GoogleCloudStorageBucket +from application.utils.imaging import ffmpeg_encode from application.utils.imaging import generate_local_thumbnails from application.utils.imaging import get_video_data -from application.utils.imaging import ffmpeg_encode from application.utils.storage import push_to_storage -from application.utils.cdn import hash_file_path -from application.utils.gcs import GoogleCloudStorageBucket -from application.utils.encoding import Encoder log = logging.getLogger(__name__)