From ac16ee5bc6562d737571c6c3c0af94686c62009f Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 9 Nov 2015 12:32:36 +0100 Subject: [PATCH] Fix minor issues --- gns3server/handlers/api/project_handler.py | 2 +- gns3server/handlers/upload_handler.py | 9 --------- gns3server/run.py | 2 +- tox.ini | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gns3server/handlers/api/project_handler.py b/gns3server/handlers/api/project_handler.py index f4460511..49e795cf 100644 --- a/gns3server/handlers/api/project_handler.py +++ b/gns3server/handlers/api/project_handler.py @@ -217,7 +217,7 @@ class ProjectHandler: response.write(("{}\n".format(msg)).encode("utf-8")) except asyncio.futures.CancelledError as e: break - except asyncio.futures.TimeoutError as e: + except asyncio.futures.TimeoutError: response.write("{\"action\": \"ping\"}\n".encode("utf-8")) project.stop_listen_queue(queue) if project.id in ProjectHandler._notifications_listening: diff --git a/gns3server/handlers/upload_handler.py b/gns3server/handlers/upload_handler.py index 7159f036..af707062 100644 --- a/gns3server/handlers/upload_handler.py +++ b/gns3server/handlers/upload_handler.py @@ -104,15 +104,6 @@ class UploadHandler: def backup_images(request, response): yield from UploadHandler._backup_directory(request, response, UploadHandler.image_directory()) - @classmethod - @Route.get( - r"/backup/projects.tar", - description="Backup GNS3 projects", - api_version=None - ) - def backup_images(request, response): - yield from UploadHandler._backup_directory(request, response, UploadHandler.project_directory()) - @staticmethod def _restore_directory(file, directory): """ diff --git a/gns3server/run.py b/gns3server/run.py index cd4c0939..9604d467 100644 --- a/gns3server/run.py +++ b/gns3server/run.py @@ -173,7 +173,7 @@ def pid_lock(path): with open(path, 'w+') as f: f.write(str(os.getpid())) except OSError as e: - log.critical("Can't write pid file %s: %s", args.pid, str(e)) + log.critical("Can't write pid file %s: %s", path, str(e)) sys.exit(1) diff --git a/tox.ini b/tox.ini index 7eb55857..343eb05a 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ commands = python setup.py test deps = -rdev-requirements.txt [pep8] -ignore = E501,E402 +ignore = E501,E402,E265 [flake8] ignore = E265,E501