changeset 1905:25e8221e99af

merge
author Roger Haase <crosseyedpenguin@yahoo.com>
date Sat, 22 Dec 2012 08:21:10 -0700
parents cbaa6b764de5 (current diff) f08df3e9c53e (diff)
children ef3c90f9cc3c
files
diffstat 18 files changed, 26 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/test_error.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/_tests/test_error.py	Sat Dec 22 08:21:10 2012 -0700
@@ -30,9 +30,11 @@
 
     def testCreateWithObject(self):
         """ error: create with any object """
-        class Foo:
+
+        class Foo(object):
             def __unicode__(self):
                 return u'טעות'
+
             def __str__(self):
                 return 'טעות'
 
@@ -44,7 +46,7 @@
         """ error: access error like a dict """
         test = 'value'
         err = error.Error(test)
-        assert '%(message)s' % err == test
+        assert '%(message)s' % dict(message=err) == test
 
 class TestCompositeError(object):
 
--- a/MoinMoin/auth/_tests/test_http.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/auth/_tests/test_http.py	Sat Dec 22 08:21:10 2012 -0700
@@ -14,7 +14,8 @@
 
 class TestHTTPAuthMoin(object):
     """ Test: HTTPAuthMoin """
-    class Auth:
+
+    class Auth(object):
         def __init__(self):
             self.username = 'ValidUser'
             self.password = 'test_pass'
--- a/MoinMoin/converter/creole_in.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/creole_in.py	Sat Dec 22 08:21:10 2012 -0700
@@ -167,7 +167,7 @@
     """
 
     def block_nowiki_lines(self, iter_content):
-        "Unescaping generator for the lines in a nowiki block"
+        """Unescaping generator for the lines in a nowiki block"""
 
         for line in iter_content:
             match = self.nowiki_end_re.match(line)
@@ -178,7 +178,7 @@
             yield line
 
     def block_nowiki_repl(self, iter_content, stack, nowiki):
-        "Handles a complete nowiki block"
+        """Handles a complete nowiki block"""
 
         stack.clear()
 
--- a/MoinMoin/converter/docbook_in.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/docbook_in.py	Sat Dec 22 08:21:10 2012 -0700
@@ -232,7 +232,6 @@
         # XXX: Error handling could probably be better.
         except NameSpaceError as detail:
             return self.error(str(detail))
-        return result
 
     def error(self, message):
         """
--- a/MoinMoin/converter/mediawiki_in.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/mediawiki_in.py	Sat Dec 22 08:21:10 2012 -0700
@@ -161,7 +161,7 @@
     """
 
     def block_table_lines(self, iter_content):
-        "Unescaping generator for the lines in a table block"
+        """Unescaping generator for the lines in a table block"""
         for line in iter_content:
             match = self.table_end_re.match(line)
             if match:
--- a/MoinMoin/converter/moinwiki_in.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/moinwiki_in.py	Sat Dec 22 08:21:10 2012 -0700
@@ -249,7 +249,7 @@
     # Matches the possibly escaped end of a nowiki block
 
     def block_nowiki_lines(self, iter_content, marker_len):
-        "Unescaping generator for the lines in a nowiki block"
+        """Unescaping generator for the lines in a nowiki block"""
 
         for line in iter_content:
             match = self.nowiki_end_re.match(line)
--- a/MoinMoin/converter/moinwiki_out.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/moinwiki_out.py	Sat Dec 22 08:21:10 2012 -0700
@@ -21,10 +21,10 @@
 
 
 class Moinwiki(object):
-    '''
+    """
     Moinwiki syntax elements
     It's dummy
-    '''
+    """
     h = u'='
     a_open = u'[['
     a_separator = u'|'
--- a/MoinMoin/converter/rst_out.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/converter/rst_out.py	Sat Dec 22 08:21:10 2012 -0700
@@ -192,7 +192,7 @@
                 line = [u'+']
                 for col in range(len(cols)):
                     if self.table[row][col][1] > 1:
-                        line.append(' '*cols[col])
+                        line.append(u' '*cols[col])
                     elif row == self.header_count - 1:
                         line.append(u'='*cols[col])
                     else:
--- a/MoinMoin/items/content.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/items/content.py	Sat Dec 22 08:21:10 2012 -0700
@@ -1011,7 +1011,7 @@
         # Set the workaround flag respected in modify.html
         is_draw = True
 
-    def handle_post():
+    def handle_post(self):
         raise NotImplementedError
 
 
--- a/MoinMoin/script/migration/moin19/import19.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/script/migration/moin19/import19.py	Sat Dec 22 08:21:10 2012 -0700
@@ -228,7 +228,8 @@
                                      # if we have an entry there
                    }
             try:
-                previous_meta = PageRevision(item, revno-1)._fs_meta
+                revpath = os.path.join(item.path, 'revisions', '{0:08d}'.format(revno-1))
+                previous_meta = PageRevision(item, revno-1, revpath).meta
                 # if this page revision is deleted, we have no on-page metadata.
                 # but some metadata is required, thus we have to copy it from the
                 # (non-deleted) revision revno-1:
--- a/MoinMoin/security/_tests/test_textcha.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/security/_tests/test_textcha.py	Sat Dec 22 08:21:10 2012 -0700
@@ -103,7 +103,7 @@
         cfg.secrets.pop('security/textcha')
         flaskg.user.profile[LOCALE] = None
 
-    class Element:
+    class Element(object):
         def __init__(self):
             self.parent = None
             self.value = 'Good Answer'
--- a/MoinMoin/storage/__init__.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/storage/__init__.py	Sat Dec 22 08:21:10 2012 -0700
@@ -33,7 +33,7 @@
     """
     backend_name_uri = uri.split(':', 1)
     if len(backend_name_uri) != 2:
-        raise ValueError("malformed backend uri: {0}".format(backend_uri))
+        raise ValueError("malformed backend uri: {0}".format(uri))
     backend_name, backend_uri = backend_name_uri
     module = __import__(BACKENDS_PACKAGE + '.' + backend_name, globals(), locals(), ['MutableBackend', ])
     return module.MutableBackend.from_uri(backend_uri)
--- a/MoinMoin/templates/global_history.html	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/templates/global_history.html	Sat Dec 22 08:21:10 2012 -0700
@@ -44,10 +44,8 @@
         {% if bookmark_time %}
         <div class="moin-history-container">
             <div class="moin-history-container-header">
-                <span>
-                    <h2>{{ bookmark_time|datetimeformat }}</h2>
-                    <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
-               </span>
+                <h2>{{ bookmark_time|datetimeformat }}</h2>
+                <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
             </div>
         </div>
         {% endif %}
--- a/MoinMoin/templates/layout.html	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/templates/layout.html	Sat Dec 22 08:21:10 2012 -0700
@@ -39,7 +39,7 @@
         {% if user.valid -%}
             {% set avatar = user.avatar(20) %}
             {% if avatar %}
-                <img id="moin-avatar" rel="noreferrer" src="{{ avatar }}" />
+                <img id="moin-avatar" src="{{ avatar }}" />
             {%- endif %}
             {% if user.name -%}
                 {% set wiki_href, aliasname, title, exists = theme_supp.userhome() %}
--- a/MoinMoin/themes/__init__.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/themes/__init__.py	Sat Dec 22 08:21:10 2012 -0700
@@ -223,7 +223,7 @@
         # Add sister pages (see http://usemod.com/cgi-bin/mb.pl?SisterSitesImplementationGuide )
         for sistername, sisterurl in self.cfg.sistersites:
             if is_local_wiki(sistername):
-                items.append(('sisterwiki current', sisterurl, sistername))
+                items.append(('sisterwiki current', sisterurl, sistername, ''))
             else:
                 cid = cache_key(usage="SisterSites", sistername=sistername)
                 sisteritems = app.cache.get(cid)
--- a/MoinMoin/themes/foobar/templates/layout.html	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/themes/foobar/templates/layout.html	Sat Dec 22 08:21:10 2012 -0700
@@ -65,7 +65,7 @@
         {% if user.valid -%}
 	    {% set avatar = user.avatar(20) %}
             {% if avatar %}
-                <li><img id="moin-avatar" rel="noreferrer" src="{{ avatar }}" /></li>
+                <li><img id="moin-avatar" src="{{ avatar }}" /></li>
             {%- endif %}
             {% if user.name -%}
                 {% set wiki_href, aliasname, title, exists = theme_supp.userhome() %}
--- a/MoinMoin/util/_tests/test_mimetype.py	Mon Dec 17 08:59:53 2012 -0700
+++ b/MoinMoin/util/_tests/test_mimetype.py	Sat Dec 22 08:21:10 2012 -0700
@@ -38,7 +38,6 @@
         for test_format, test_mimetype in test:
             result = MimeType_obj.parse_format(test_format)
             assert result == test_mimetype
-        result = MimeType_obj.parse_format(test_format)
 
     def test_mime_type(self):
         test = [
--- a/docs/admin/configure.rst	Mon Dec 17 08:59:53 2012 -0700
+++ b/docs/admin/configure.rst	Sat Dec 22 08:21:10 2012 -0700
@@ -253,10 +253,9 @@
 
 * to register your image for your email at gravatar.com, you need to give them
   your email address, which is the same as you use in your wiki user profile.
-* we try to avoid exposing the referrer URL to gravatar.com, but this only
-  works if your browser correctly implements rel="noreferrer". If it does not,
-  your wiki item URLs will be exposed, so they will roughly know which people
-  read or work on which wiki items.
+* when the wiki displays an avatar image on some item / view, the URL will be
+  exposed as referrer to the avatar service provider, so they will roughly
+  know which people read or work on which wiki items / views.
 
 XStatic Packages
 ----------------