mirror of
https://github.com/django/django.git
synced 2025-08-31 07:47:37 +00:00
Reverted "Fixed #27818 -- Replaced try/except/pass with contextlib.suppress()."
This reverts commit 550cb3a365
because try/except performs better.
This commit is contained in:
parent
8b2515a450
commit
6e4c6281db
66 changed files with 351 additions and 207 deletions
|
@ -12,7 +12,6 @@ import subprocess
|
|||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
from contextlib import suppress
|
||||
from io import StringIO
|
||||
from unittest import mock
|
||||
|
||||
|
@ -96,10 +95,12 @@ class AdminScriptTestCase(unittest.TestCase):
|
|||
|
||||
# Also try to remove the compiled file; if it exists, it could
|
||||
# mess up later tests that depend upon the .py file not existing
|
||||
with suppress(OSError):
|
||||
try:
|
||||
if sys.platform.startswith('java'):
|
||||
# Jython produces module$py.class files
|
||||
os.remove(re.sub(r'\.py$', '$py.class', full_name))
|
||||
except OSError:
|
||||
pass
|
||||
# Also remove a __pycache__ directory, if it exists
|
||||
cache_name = os.path.join(self.test_dir, '__pycache__')
|
||||
if os.path.isdir(cache_name):
|
||||
|
@ -165,8 +166,10 @@ class AdminScriptTestCase(unittest.TestCase):
|
|||
|
||||
def run_manage(self, args, settings_file=None):
|
||||
def safe_remove(path):
|
||||
with suppress(OSError):
|
||||
try:
|
||||
os.remove(path)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
conf_dir = os.path.dirname(conf.__file__)
|
||||
template_manage_py = os.path.join(conf_dir, 'project_template', 'manage.py-tpl')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue