[Zope3-checkins] SVN: Zope3/trunk/ Merged r40837 from the 3.2 branch. This fixes #522.

[Derrick Hudson]

Log message for revision 40839:
  Merged r40837 from the 3.2 branch.  This fixes #522.
  

Changed:
  U   Zope3/trunk/src/zope/app/server/mkzopeinstance.py
  U   Zope3/trunk/zopeskel/etc/principals.zcml.in

-=-
Modified: Zope3/trunk/src/zope/app/server/mkzopeinstance.py
===================================================================
--- Zope3/trunk/src/zope/app/server/mkzopeinstance.py	2005-12-16 22:47:40 UTC (rev 40838)
+++ Zope3/trunk/src/zope/app/server/mkzopeinstance.py	2005-12-16 23:01:06 UTC (rev 40839)
@@ -27,6 +27,8 @@
 import shutil
 import sys
 
+from  xml.sax.saxutils import quoteattr as xml_quoteattr
+
 import zope
 
 from zope.app.authentication import password
@@ -212,7 +214,9 @@
         software_home = os.path.dirname(os.path.dirname(zope_init))
         self.replacements = [
             ("<<USERNAME>>", options.username),
+            ("<<USERNAME-XMLATTR>>", xml_quoteattr(options.username)),
             ("<<PASSWORD>>", options.password),
+            ("<<PASSWORD-XMLATTR>>", xml_quoteattr(options.password)),
             ("<<PASSWORD_MANAGER>>", options.password_manager),
             ("<<PYTHON>>", sys.executable),
             ("<<INSTANCE_HOME>>", options.destination),

Modified: Zope3/trunk/zopeskel/etc/principals.zcml.in
===================================================================
--- Zope3/trunk/zopeskel/etc/principals.zcml.in	2005-12-16 22:47:40 UTC (rev 40838)
+++ Zope3/trunk/zopeskel/etc/principals.zcml.in	2005-12-16 23:01:06 UTC (rev 40839)
@@ -26,9 +26,9 @@
   <principal
     id="zope.manager"
     title="Manager"
-    login="<<USERNAME>>"
+    login=<<USERNAME-XMLATTR>>
     password_manager="<<PASSWORD_MANAGER>>"
-    password="<<PASSWORD>>"
+    password=<<PASSWORD-XMLATTR>>
     />
 
   <grant