From fbd6776e68a12aa7bf7d646ca03d568cedc616f3 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Fri, 26 Aug 2011 11:48:33 +0100 Subject: [PATCH] Fixed a bug in the testsuite that caused problems when dots where in directory names --- flask/testsuite/config.py | 4 ++-- flask/testsuite/helpers.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flask/testsuite/config.py b/flask/testsuite/config.py index b9fa6b48..2ed726c8 100644 --- a/flask/testsuite/config.py +++ b/flask/testsuite/config.py @@ -29,7 +29,7 @@ class ConfigTestCase(FlaskTestCase): def test_config_from_file(self): app = flask.Flask(__name__) - app.config.from_pyfile(__file__.rsplit('.')[0] + '.py') + app.config.from_pyfile(__file__.rsplit('.', 1)[0] + '.py') self.common_object_test(app) def test_config_from_object(self): @@ -59,7 +59,7 @@ class ConfigTestCase(FlaskTestCase): self.assert_(0, 'expected exception') self.assert_(not app.config.from_envvar('FOO_SETTINGS', silent=True)) - os.environ = {'FOO_SETTINGS': __file__.rsplit('.')[0] + '.py'} + os.environ = {'FOO_SETTINGS': __file__.rsplit('.', 1)[0] + '.py'} self.assert_(app.config.from_envvar('FOO_SETTINGS')) self.common_object_test(app) finally: diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py index 4bd05e3d..56264f70 100644 --- a/flask/testsuite/helpers.py +++ b/flask/testsuite/helpers.py @@ -231,7 +231,7 @@ class LoggingTestCase(FlaskTestCase): c.get('/') out = err.getvalue() self.assert_('WARNING in helpers [' in out) - self.assert_(os.path.basename(__file__.rsplit('.')[0] + '.py') in out) + self.assert_(os.path.basename(__file__.rsplit('.', 1)[0] + '.py') in out) self.assert_('the standard library is dead' in out) self.assert_('this is a debug statement' in out)