From 6d6c248706a2b7a388ab37bc12a38d1b3806ba63 Mon Sep 17 00:00:00 2001 From: Maciej Tronowski Date: Wed, 22 Apr 2015 11:44:32 +0200 Subject: [PATCH 1/1] rename FTPException -> FTPError --- filex/ftp.py | 4 ++-- filex/views.py | 8 ++++---- qcg/middleware.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/filex/ftp.py b/filex/ftp.py index 4ed4e50..2c92f12 100644 --- a/filex/ftp.py +++ b/filex/ftp.py @@ -10,7 +10,7 @@ from django.utils.timezone import localtime, UTC from gridftp import FTPClient, Buffer, HandleAttr, OperationAttr -class FTPException(Exception): +class FTPError(Exception): pass @@ -74,7 +74,7 @@ class FTPOperation: msg = match.groups()[0] if match else "Unknown error" - raise FTPException(msg) + raise FTPError(msg) def listing(self, url): self.cli.verbose_list(url, self._done, None, self.op_attr) diff --git a/filex/views.py b/filex/views.py index 8cb0f05..f5aabb8 100644 --- a/filex/views.py +++ b/filex/views.py @@ -13,7 +13,7 @@ from django.views.generic import View from filex.forms import HostPathNameForm, RenameForm, FavoriteForm, HostPathForm, ExtractForm, HostItemsForm, \ CompressForm -from filex.ftp import FTPOperation, FTPException +from filex.ftp import FTPOperation, FTPError from filex.models import Favorite from filex.uploadhandler import with_ftp_upload_handler @@ -37,7 +37,7 @@ class FTPView(View): try: return self.handle(FTPOperation(request.session['proxy']), form.cleaned_data) - except FTPException as e: + except FTPError as e: status = 400 if 'No such file or directory' in e.message: status = 404 @@ -102,7 +102,7 @@ class DeleteView(FTPView): for path in params['dirs']: try: ftp.rmdir(url + path) - except FTPException as e: + except FTPError as e: fail[path] = e.message else: done.append(path) @@ -110,7 +110,7 @@ class DeleteView(FTPView): for path in params['files']: try: ftp.delete(url + path) - except FTPException as e: + except FTPError as e: fail[path] = e.message else: done.append(path) diff --git a/qcg/middleware.py b/qcg/middleware.py index d10b927..e6c4144 100644 --- a/qcg/middleware.py +++ b/qcg/middleware.py @@ -1,11 +1,11 @@ from django.http import JsonResponse -from filex.ftp import FTPException +from filex.ftp import FTPError class FTPMiddleware(object): def process_exception(self, request, exception): - if isinstance(exception, FTPException): + if isinstance(exception, FTPError): message = exception.message status = 400 -- 1.7.9.5