mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-23 23:38:21 +00:00
glob.escape is available with Python 3.4
This commit is contained in:
parent
4c13f8e6ea
commit
da7f910482
@ -34,7 +34,6 @@ log = logging.getLogger(__name__)
|
||||
|
||||
from gns3server.utils.interfaces import get_windows_interfaces, is_interface_up
|
||||
from gns3server.utils.asyncio import wait_run_in_executor
|
||||
from gns3server.utils.glob import glob_escape
|
||||
from pkg_resources import parse_version
|
||||
from uuid import UUID, uuid4
|
||||
from ..base_manager import BaseManager
|
||||
@ -169,11 +168,11 @@ class Dynamips(BaseManager):
|
||||
yield from super().project_closed(project)
|
||||
# delete useless Dynamips files
|
||||
project_dir = project.module_working_path(self.module_name.lower())
|
||||
files = glob.glob(glob_escape(os.path.join(project_dir, "*.ghost")))
|
||||
files += glob.glob(glob_escape(os.path.join(project_dir, "*_lock")))
|
||||
files += glob.glob(glob_escape(os.path.join(project_dir, "ilt_*")))
|
||||
files += glob.glob(glob_escape(os.path.join(project_dir, "c[0-9][0-9][0-9][0-9]_i[0-9]*_rommon_vars")))
|
||||
files += glob.glob(glob_escape(os.path.join(project_dir, "c[0-9][0-9][0-9][0-9]_i[0-9]*_log.txt")))
|
||||
files = glob.glob(glob.escape(os.path.join(project_dir, "*.ghost")))
|
||||
files += glob.glob(glob.escape(os.path.join(project_dir, "*_lock")))
|
||||
files += glob.glob(glob.escape(os.path.join(project_dir, "ilt_*")))
|
||||
files += glob.glob(glob.escape(os.path.join(project_dir, "c[0-9][0-9][0-9][0-9]_i[0-9]*_rommon_vars")))
|
||||
files += glob.glob(glob.escape(os.path.join(project_dir, "c[0-9][0-9][0-9][0-9]_i[0-9]*_log.txt")))
|
||||
for file in files:
|
||||
try:
|
||||
log.debug("Deleting file {}".format(file))
|
||||
|
@ -1,45 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright (C) 2013 GNS3 Technologies Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sys
|
||||
import re
|
||||
import os
|
||||
import glob
|
||||
|
||||
|
||||
def glob_escape(pathname):
|
||||
"""
|
||||
Escape all special chars for glob.
|
||||
For Python after 3.4 we use the glob.escape method.
|
||||
|
||||
:returns: Escaped path
|
||||
"""
|
||||
|
||||
if sys.version_info < (3, 4):
|
||||
# Extracted from Python 3.4 source code
|
||||
# Escaping is done by wrapping any of "*?[" between square brackets.
|
||||
# Metacharacters do not work in the drive part and shouldn't be escaped.
|
||||
magic_check = re.compile('([*?[])')
|
||||
magic_check_bytes = re.compile(b'([*?[])')
|
||||
drive, pathname = os.path.splitdrive(pathname)
|
||||
if isinstance(pathname, bytes):
|
||||
pathname = magic_check_bytes.sub(br'[\1]', pathname)
|
||||
else:
|
||||
pathname = magic_check.sub(r'[\1]', pathname)
|
||||
return drive + pathname
|
||||
else:
|
||||
return glob.escape(pathname)
|
Loading…
Reference in New Issue
Block a user