Merge remote-tracking branch 'refs/remotes/spaetz/WIP/user_tag_gallery'

[mediagoblin.git] / mediagoblin / tests / test_config.py

diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index 7d8c65c1b1e042b02e01a7481949c690e1fc1576..b13adae6147cbbcce2fcdb05fbd5637b005633ca 100644 (file)
--- a/mediagoblin/tests/test_config.py
+++ b/mediagoblin/tests/test_config.py
@@ -36,7 +36,7 @@ def test_read_mediagoblin_config():
 
     assert this_conf['carrotapp']['carrotcake'] == False
     assert this_conf['carrotapp']['num_carrots'] == 1
-    assert not this_conf['carrotapp'].has_key('encouragement_phrase')
+    assert 'encouragement_phrase' not in this_conf['carrotapp']
     assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == True
 
     # A good file