From 44e43727be13e3554342c2b5b75b7dc42abdb18c Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 30 Nov 2014 21:51:03 -0500
Subject: Checkpointing.

By using `six` I think I have most of the imports squared away.  There's
probably still uses of `unicode` built-ins that need fixing.

The idea is to first get the test suite running (which it doesn't yet), and
then to fix tests.

There's a bug in lazr.config which requires us to patch it for now.
---
 src/mailman/core/initialize.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index c2395db10..6c7196990 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -39,7 +39,7 @@ __all__ = [
 import os
 import sys
 
-from pkg_resources import resource_string
+from pkg_resources import resource_string as resource_bytes
 from zope.component import getUtility
 from zope.configuration import xmlconfig
 
@@ -109,8 +109,8 @@ def initialize_1(config_path=None):
     :param config_path: The path to the configuration file.
     :type config_path: string
     """
-    zcml = resource_string('mailman.config', 'configure.zcml')
-    xmlconfig.string(zcml)
+    zcml = resource_bytes('mailman.config', 'configure.zcml')
+    xmlconfig.string(zcml.decode('utf-8'))
     # By default, set the umask so that only owner and group can read and
     # write our files.  Specifically we must have g+rw and we probably want
     # o-rwx although I think in most cases it doesn't hurt if other can read
-- 
cgit v1.2.3-70-g09d2