mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 09:06:13 +00:00
Code Issues 32 Releases Wiki Activity

[py3k] Silence many warnings while running the tests.

Browse Source
This commit is contained in:
Alex Gaynor
2012-09-07 13:17:09 -04:00
parent 4321ee25c5
commit 292322f977
29 changed files with 213 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/regressiontests/templates/loaders.py
View File

@@ -17,7 +17,7 @@ import os.path
from django.template import TemplateDoesNotExist, Context
from django.template.loaders.eggs import Loader as EggLoader
from django.template import loader
from django.utils import unittest
from django.utils import unittest, six
from django.utils.six import StringIO
@@ -30,7 +30,7 @@ class MockProvider(pkg_resources.NullProvider):
def _has(self, path):
return path in self.module._resources
def _isdir(self,path):
def _isdir(self, path):
return False
def get_resource_stream(self, manager, resource_name):
@@ -61,8 +61,8 @@ class EggLoaderTest(unittest.TestCase):
self.empty_egg = create_egg("egg_empty", {})
self.egg_1 = create_egg("egg_1", {
os.path.normcase('templates/y.html') : StringIO("y"),
os.path.normcase('templates/x.txt') : StringIO("x"),
os.path.normcase('templates/y.html'): StringIO("y"),
os.path.normcase('templates/x.txt'): StringIO("x"),
})
self._old_installed_apps = settings.INSTALLED_APPS
settings.INSTALLED_APPS = []
@@ -144,12 +144,12 @@ class RenderToStringTest(unittest.TestCase):
self.assertEqual(context['obj'], 'before')
def test_empty_list(self):
self.assertRaisesRegexp(TemplateDoesNotExist,
six.assertRaisesRegex(self, TemplateDoesNotExist,
'No template names provided$',
loader.render_to_string, [])
def test_select_templates_from_empty_list(self):
self.assertRaisesRegexp(TemplateDoesNotExist,
six.assertRaisesRegex(self, TemplateDoesNotExist,
'No template names provided$',
loader.select_template, [])