changeset 1392:7a2ee6335ea9

merge
author Cheer Xiao <xiaqqaix@gmail.com>
date Fri, 15 Jun 2012 17:50:30 +0800
parents 339668f8ad06 (current diff) 3989635de0fb (diff)
children 0f0932809e1e
files MoinMoin/items/__init__.py
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Jun 15 17:49:03 2012 +0800
+++ b/.hgignore	Fri Jun 15 17:50:30 2012 +0800
@@ -25,3 +25,5 @@
 .orig$
 .rej$
 .~$
+^docs/devel/api/modules.rst
+^upload.py
--- a/MoinMoin/items/__init__.py	Fri Jun 15 17:49:03 2012 +0800
+++ b/MoinMoin/items/__init__.py	Fri Jun 15 17:50:30 2012 +0800
@@ -112,7 +112,7 @@
             return NotImplemented
 
         def __repr__(self):
-            return '<{0}: {1}, prio {2} [{3!r}]>' % (self.__class__.__name__,
+            return '<{0}: {1}, prio {2} [{3!r}]>'.format(self.__class__.__name__,
                     self.content_type,
                     self.priority,
                     self.factory)