From 90e84bee5f47cbcdb9e9c367c60a877e325ef3e7 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Thu, 28 Jul 2016 23:10:56 -0400
Subject: Rebase mailman/mailman!180 and cleanup # noqa

---
 src/mailman/core/initialize.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mailman/core/initialize.py')

diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 7446418d2..7b39465c5 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -40,7 +40,8 @@ from zope.configuration import xmlconfig
 # The test infrastructure uses this to prevent the search and loading of any
 # existing configuration file.  Otherwise the existence of say a
 # ~/.mailman.cfg file can break tests.
-public(INHIBIT_CONFIG_FILE=object())
+INHIBIT_CONFIG_FILE = object()
+public(INHIBIT_CONFIG_FILE=INHIBIT_CONFIG_FILE)
 
 
 def search_for_configuration_file():
@@ -112,7 +113,7 @@ def initialize_1(config_path=None):
     # configuration file is searched for in the file system.
     if config_path is None:
         config_path = search_for_configuration_file()
-    elif config_path is INHIBIT_CONFIG_FILE:        # noqa
+    elif config_path is INHIBIT_CONFIG_FILE:
         # For the test suite, force this back to not using a config file.
         config_path = None
     mailman.config.config.load(config_path)
-- 
cgit v1.2.3-70-g09d2