[Zope-Checkins] CVS: Zope3/lib/python/Zope/Configuration - xmlconfig.py:1.1.2.9.2.1

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/Configuration
In directory cvs.zope.org:/tmp/cvs-serv7913/Configuration

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	xmlconfig.py 
Log Message:
- Fixed bug with the ZopeConfigurationConflictError, which would not allow
  the error message to be properly displayed. The bug was caused, since dis
  was a tuple, not a tring. A simple str() cast fixed the issue.


=== Zope3/lib/python/Zope/Configuration/xmlconfig.py 1.1.2.9 => 1.1.2.9.2.1 ===
         r = ["Conflicting configuration actions"]
         for dis, locs in self._conflicts.items():
-            r.append('for: %s' % dis)
+            r.append('for: %s' %str(dis))
             for loc in locs:
                 r.append("  at line %s column %s of %s" % loc)
-        
+                
         return "\n".join(r)
     
 class XMLConfig: