changeset 1390:3989635de0fb

merged DasIch's changes
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 14 Jun 2012 18:49:15 +0200
parents ab98b4172d5a (current diff) 522d2cea9ec8 (diff)
children 7a2ee6335ea9 356390d3f4a4 7e52a847d5ff 8a98f36317a8
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Jun 14 07:14:21 2012 -0700
+++ b/.hgignore	Thu Jun 14 18:49:15 2012 +0200
@@ -25,3 +25,5 @@
 .orig$
 .rej$
 .~$
+^docs/devel/api/modules.rst
+^upload.py
--- a/MoinMoin/items/__init__.py	Thu Jun 14 07:14:21 2012 -0700
+++ b/MoinMoin/items/__init__.py	Thu Jun 14 18:49:15 2012 +0200
@@ -111,7 +111,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)