changeset 2485:0c66cfd93cd9

Merge main.
author Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl>
date Sat, 21 Jul 2007 02:32:43 +0200
parents fe625067fa0f (current diff) 839b360413a9 (diff)
children 8fb3dc91df77 509cde9e567f
files MoinMoin/support/copy.py MoinMoin/userprefs/prefs.py
diffstat 54 files changed, 417 insertions(+), 531 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/pep8.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/pep8.py	Sat Jul 21 02:32:43 2007 +0200
@@ -99,6 +99,10 @@
 
 indent_match = re.compile(r'([ \t]*)').match
 raise_comma_match = re.compile(r'raise\s+\w+\s*(,)').match
+equals_boolean_search = re.compile(r'([!=]=\s*(True|False))|((True|False)\s*[!=]=)').search
+equals_None_search = re.compile(r'([!=]=\s*None)|(None\s*[!=]=)').search
+
+not_one_ws_around_operators_match = re.compile(r'^[^\(\[]+[^\s](\+|\-|\*|/|%|\^|&|\||=|<|>|>>|<<|\+=|\-=|\*=|/=|%=|\^=|&=|\|=|==|<=|>=|>>=|<<=|!=|<>)[^\s][^\)\]]+$').match
 
 operators = """
 +  -  *  /  %  ^  &  |  =  <  >  >>  <<
@@ -316,7 +320,7 @@
         prev_end = end
 
 
-def whitespace_around_operator(logical_line):
+def extra_whitespace_around_operator(logical_line):
     """
     Avoid extraneous whitespace in the following situations:
 
@@ -339,6 +343,15 @@
             return found, "E224 tab after operator"
 
 
+def whitespace_around_operator(logical_line):
+    """
+    Have exactly 1 space left and right of the operator.
+    """
+    match = not_one_ws_around_operators_match(logical_line)
+    if match and not 'lambda' in logical_line:
+        return match.start(1), "E225 operators shall be surrounded by a single space on each side %s" % logical_line
+
+
 def whitespace_around_comma(logical_line):
     """
     Avoid extraneous whitespace in the following situations:
@@ -415,6 +428,34 @@
         return match.start(1), "W602 deprecated form of raising exception"
 
 
+def dumb_equals_boolean(logical_line):
+    """
+    Using "if x == True:" or "if x == False:" is wrong in any case:
+
+    First if you already have a boolean, you don't need to compare it to
+    another boolean. Just use "if x:" or "if not x:".
+
+    Second, even if you have some sort of "tristate logic", not only using
+    True/False, but other values, then you want to use "if x is True:" or
+    "if x is False:" because there is exactly one True and one False object.
+    """
+    match = equals_boolean_search(logical_line)
+    if match:
+        return match.start(1), "E798 don't use 'x == <boolean>', but just 'x' or 'not x' or 'x is <boolean>'"
+
+
+def dumb_equals_None(logical_line):
+    """
+    Using "if x == None:" is wrong in any case:
+
+    You either want to use "if x is None:" (there is only 1 None object) or -
+    in some simple cases - just "if not x:".
+    """
+    match = equals_None_search(logical_line)
+    if match:
+        return match.start(1), "E799 don't use 'x == None', but just 'x is None' or 'not x'"
+
+
 ##############################################################################
 # Helper functions
 ##############################################################################
--- a/MoinMoin/_tests/test_Page.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_Page.py	Sat Jul 21 02:32:43 2007 +0200
@@ -61,3 +61,5 @@
         assert u'' not in pagelist
 
 
+coverage_modules = ['MoinMoin.Page']
+
--- a/MoinMoin/_tests/test_PageEditor.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_PageEditor.py	Sat Jul 21 02:32:43 2007 +0200
@@ -197,3 +197,7 @@
     print "PageEditor can't save a page if Abort is returned from PreSave event handlers"
     page = Page(request, pagename)
     assert page.body != testtext
+
+
+coverage_modules = ['MoinMoin.PageEditor']
+
--- a/MoinMoin/_tests/test_error.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_error.py	Sat Jul 21 02:32:43 2007 +0200
@@ -43,3 +43,5 @@
         err = error.Error(test)
         self.assertEqual('%(message)s' % err, test)
 
+coverage_modules = ['MoinMoin.error']
+
--- a/MoinMoin/_tests/test_packages.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_packages.py	Sat Jul 21 02:32:43 2007 +0200
@@ -78,3 +78,5 @@
         for line in ([':foo', 'is\\', 'ja|', u't|', u'baAz'], [], ['', '']):
             assert line == unpackLine(packLine(line))
 
+coverage_modules = ['MoinMoin.packages']
+
--- a/MoinMoin/_tests/test_sourcecode.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_sourcecode.py	Sat Jul 21 02:32:43 2007 +0200
@@ -29,8 +29,8 @@
                              # use 'fix' with extreme caution and in a separate changeset!
 FIX_TS_RE = re.compile(r' +$', re.M) # 'fix' mode: everything matching the trailing space re will be removed
 
-
 RECENTLY = time.time() - 7 * 24*60*60 # we only check stuff touched recently.
+RECENTLY = 0 # check everything!
 # After doing a fresh clone, this procedure is recommended:
 # 1. Run the tests once to see if everything is OK (as cloning updates the mtime,
 #    it will test every file).
--- a/MoinMoin/_tests/test_user.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_user.py	Sat Jul 21 02:32:43 2007 +0200
@@ -263,3 +263,6 @@
             self.assertEqual(result, expected,
                              'Expected "%(expected)s" but got "%(result)s"' % locals())
 
+
+coverage_modules = ['MoinMoin.user']
+
--- a/MoinMoin/_tests/test_wikidicts.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_wikidicts.py	Sat Jul 21 02:32:43 2007 +0200
@@ -114,4 +114,5 @@
         assert 'RecentChanges' in members
         assert 'HelpContents' in members
 
+coverage_modules = ['MoinMoin.wikidicts']
 
--- a/MoinMoin/_tests/test_wikisync.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_wikisync.py	Sat Jul 21 02:32:43 2007 +0200
@@ -37,3 +37,5 @@
         tags = TagStore(self.page)
         tags.clear()
 
+coverage_modules = ['MoinMoin.wikisync']
+
--- a/MoinMoin/_tests/test_wikiutil.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/_tests/test_wikiutil.py	Sat Jul 21 02:32:43 2007 +0200
@@ -196,3 +196,5 @@
         self.assert_(result == expected,
                      'Expected "%(expected)s" but got "%(result)s"' % locals())
 
+coverage_modules = ['MoinMoin.wikiutil']
+
--- a/MoinMoin/action/newaccount.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/action/newaccount.py	Sat Jul 21 02:32:43 2007 +0200
@@ -43,6 +43,12 @@
     password = form.get('password', [''])[0]
     password2 = form.get('password2', [''])[0]
 
+    pw_checker = request.cfg.password_checker
+    if pw_checker:
+        pw_error = pw_checker(theuser.name, password)
+        if pw_error:
+            return _("Password not acceptable: %s") % pw_error
+
     # Check if password is given and matches with password repeat
     if password != password2:
         return _("Passwords don't match!")
--- a/MoinMoin/action/rss_rc.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/action/rss_rc.py	Sat Jul 21 02:32:43 2007 +0200
@@ -200,7 +200,7 @@
                 for idx in range(rl):
                     rev = revisions[idx]
                     if rev <= item.rev:
-                        if idx+1 < rl:
+                        if idx + 1 < rl:
                             lines = wikiutil.pagediff(request, item.pagename, revisions[idx+1], item.pagename, 0, ignorews=1)
                             if len(lines) > 20:
                                 lines = lines[:20] + ['...\n']
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/config/_tests/test_multiconfig.py	Sat Jul 21 02:32:43 2007 +0200
@@ -0,0 +1,67 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - MoinMoin.config.multiconfig Tests
+
+    @copyright: 2007 by MoinMoin:ThomasWaldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+try:
+    set
+except:
+    from sets import Set as set
+
+import py
+
+
+class TestPasswordChecker:
+    username = u"SomeUser"
+    tests_builtin = [
+        (u'', False), # empty
+        (u'1966', False), # too short
+        (u'asdfghjk', False), # keyboard sequence
+        (u'QwertZuiop', False), # german keyboard sequence, with uppercase
+        (u'mnbvcx', False), # reverse keyboard sequence
+        (u'12345678', False), # keyboard sequence, too easy
+        (u'aaaaaaaa', False), # not enough different chars
+        (u'BBBaaaddd', False), # not enough different chars
+        (username, False), # username == password
+        (username[1:-1], False), # password in username
+        (u"XXX%sXXX" % username, False), # username in password
+        (u'Moin-2007', True), # this should be OK
+    ]
+    tests_crack = tests_builtin + [
+        (u'secret', False), # word from dictionary
+        (u'password', False), # word from dictionary
+    ]
+    def testBuiltinPasswordChecker(self):
+        pw_checker = self.request.cfg.password_checker
+        if not pw_checker:
+            py.test.skip("password_checker is disabled in the configuration, not testing it")
+        else:
+            for pw, result in self.tests_builtin:
+                pw_error = pw_checker(self.username, pw)
+                print "%r: %s" % (pw, pw_error)
+                assert result == (pw_error is None)
+
+    def testCrackPasswordChecker(self):
+        pw_checker = self.request.cfg.password_checker
+        if not pw_checker:
+            py.test.skip("password_checker is disabled in the configuration, not testing it")
+        else:
+            try:
+                import crack # do we have python-crack?
+            except:
+                py.test.skip("python-crack is not installed")
+            try:
+                crack.FascistCheck("a12fv./ZX47") # this should not raise an exception
+            except:
+                py.test.skip("python-crack is not working correctly (did you forget to build the dicts?)")
+            else:
+                for pw, result in self.tests_crack:
+                    pw_error = pw_checker(self.username, pw)
+                    print "%r: %s" % (pw, pw_error)
+                    assert result == (pw_error is None)
+
+coverage_modules = ['MoinMoin.config.multiconfig']
+
--- a/MoinMoin/config/multiconfig.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/config/multiconfig.py	Sat Jul 21 02:32:43 2007 +0200
@@ -15,6 +15,9 @@
 from MoinMoin import config, error, util, wikiutil
 import MoinMoin.auth as authmodule
 import MoinMoin.events as events
+from MoinMoin.events import PageChangedEvent, PageRenamedEvent
+from MoinMoin.events import PageDeletedEvent, PageCopiedEvent
+from MoinMoin.events import PageRevertedEvent, FileAttachedEvent
 from MoinMoin import session
 from MoinMoin.packages import packLine
 from MoinMoin.security import AccessControlList
@@ -205,9 +208,6 @@
 class DefaultConfig:
     """ default config values """
 
-    # internal dict for plugin `modules' lists
-    _site_plugin_lists = {}
-
     # setting DesktopEdition = True gives all local users special powers - ONLY use for MMDE style usage!
     DesktopEdition = False
 
@@ -433,6 +433,54 @@
         'view':        ({}, _("View"), "view"),
         }
 
+
+    def password_checker(username, password):
+        """ Check if a password is secure enough.
+            First (and in any case), we use a built-in check to get rid of the
+            worst passwords. If there is cracklib installed, we use it for
+            additional checks.
+            If you don't want to check passwords, use password_checker = None.
+
+            @return: None if there is no problem with the password,
+                     some string with an error msg, if the password is problematic.
+        """
+        try:
+            # in any case, do a very simple built-in check to avoid the worst passwords
+            if len(password) < 6:
+                raise ValueError("Password too short.")
+            if len(set(password)) < 4:
+                raise ValueError("Password has not enough different characters.")
+
+            username_lower = username.lower()
+            password_lower = password.lower()
+            if username in password or password in username or \
+               username_lower in password_lower or password_lower in username_lower:
+                raise ValueError("Password too easy (containment).")
+
+            keyboards = (ur"`1234567890-=qwertyuiop[]\asdfghjkl;'zxcvbnm,./", # US kbd
+                         ur"^1234567890ߴqwertzuiop+asdfghjkl#yxcvbnm,.-", # german kbd
+                        ) # add more keyboards!
+            for kbd in keyboards:
+                rev_kbd = kbd[::-1]
+                if password in kbd or password in rev_kbd or \
+                   password_lower in kbd or password_lower in rev_kbd:
+                    raise ValueError("Password too easy (kbd sequence)")
+            try:
+                # to use advanced checking, you need to install python-crack,
+                # cracklib-runtime (dict processing) and do not forget to
+                # initialize the crack dicts!
+                import crack
+                # instead of some "old password" we give the username to check
+                # whether the password is too similar to the username
+                crack.VeryFascistCheck(password, username) # raises ValueError on bad passwords
+            except ImportError:
+                pass
+            return None
+        except ValueError, err:
+            return str(err)
+
+    password_checker = staticmethod(password_checker)
+
     quicklinks_default = [] # preload user quicklinks with this page list
     refresh = None # (minimum_delay, type), e.g.: (2, 'internal')
     rss_cache = 60 # suggested caching time for RecentChanges RSS, in seconds
@@ -452,7 +500,15 @@
     stylesheets = [] # list of tuples (media, csshref) to insert after theme css, before user css
     _subscribable_events = None # A list of event types that user can subscribe to
     subscribed_pages_default = [] # preload user subscribed pages with this page list
-    subscribed_events_default = [] # preload user subscribed events with this list
+    email_subscribed_events_default = [
+        PageChangedEvent.__name__,
+        PageRenamedEvent.__name__,
+        PageDeletedEvent.__name__,
+        PageCopiedEvent.__name__,
+        PageRevertedEvent.__name__,
+        FileAttachedEvent.__name__,
+    ]
+    jabber_subscribed_events_default = []
     superuser = [] # list of unicode user names that have super powers :)
     supplementation_page = False
     supplementation_page_name = u'Discussion'
@@ -552,11 +608,10 @@
                               'show_fancy_diff':     1,
                               'wikiname_add_spaces': 0,
                               'remember_me':         1,
-                              'want_trivial':        0,
                              }
 
     # don't let the user change those
-    # user_checkbox_disable = ['disabled', 'want_trivial']
+    # user_checkbox_disable = ['disabled']
     user_checkbox_disable = []
 
     # remove those checkboxes:
@@ -597,8 +652,8 @@
 
     user_homewiki = 'Self' # interwiki name for where user homepages are located
 
-    unzip_single_file_size = 2.0 * 1000**2
-    unzip_attachments_space = 200.0 * 1000**2
+    unzip_single_file_size = 2.0 * 1000 ** 2
+    unzip_attachments_space = 200.0 * 1000 ** 2
     unzip_attachments_count = 101 # 1 zip file + 100 files contained in it
 
     xmlrpc_putpage_enabled = False # if False, putpage will write to a test page only
@@ -670,6 +725,10 @@
                 self.chart_options = None
 
         # post process
+
+        # internal dict for plugin `modules' lists
+        self._site_plugin_lists = {}
+
         # we replace any string placeholders with config values
         # e.g u'%(page_front_page)s' % self
         self.navi_bar = [elem % self for elem in self.navi_bar]
--- a/MoinMoin/converter/_tests/test_text_html_text_moin_wiki.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/converter/_tests/test_text_html_text_moin_wiki.py	Sat Jul 21 02:32:43 2007 +0200
@@ -1134,3 +1134,6 @@
 """
         self.do(test, output)
 
+
+coverage_modules = ['MoinMoin.converter.text_html_text_moin_wiki']
+
--- a/MoinMoin/filter/EXIF.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/filter/EXIF.py	Sat Jul 21 02:32:43 2007 +0200
@@ -738,8 +738,8 @@
     def reduce(self):
         div = gcd(self.num, self.den)
         if div > 1:
-            self.num = self.num/div
-            self.den = self.den/div
+            self.num = self.num / div
+            self.den = self.den / div
 
 # for ease of dealing with tags
 class IFD_Tag:
@@ -845,7 +845,7 @@
             typelen = FIELD_TYPES[field_type][0]
             count = self.s2n(entry+4, 4)
             offset = entry+8
-            if count*typelen > 4:
+            if count * typelen > 4:
                 # offset is not the value; it's a pointer to the value
                 # if relative we set things up so s2n will seek to the right
                 # place when it adds self.offset.  Note that this 'relative'
@@ -879,7 +879,7 @@
                     else:
                         value = self.s2n(offset, typelen, signed)
                     values.append(value)
-                    offset = offset+typelen
+                    offset = offset + typelen
             # now "values" is either a string or an array
             if count == 1 and field_type != 2:
                 printable = str(values[0])
@@ -924,24 +924,24 @@
 
         # fix up large value offset pointers into data area
         for i in range(entries):
-            entry = thumb_ifd+2+12*i
+            entry = thumb_ifd + 2 + 12 * i
             tag = self.s2n(entry, 2)
             field_type = self.s2n(entry+2, 2)
             typelen = FIELD_TYPES[field_type][0]
             count = self.s2n(entry+4, 4)
             oldoff = self.s2n(entry+8, 4)
             # start of the 4-byte pointer area in entry
-            ptr = i*12+18
+            ptr = i * 12 + 18
             # remember strip offsets location
             if tag == 0x0111:
                 strip_off = ptr
-                strip_len = count*typelen
+                strip_len = count * typelen
             # is it in the data area?
-            if count*typelen > 4:
+            if count * typelen > 4:
                 # update offset pointer (nasty "strings are immutable" crap)
                 # should be able to say "tiff[ptr:ptr+4]=newoff"
                 newoff = len(tiff)
-                tiff = tiff[:ptr]+self.n2s(newoff, 4)+tiff[ptr+4:]
+                tiff = tiff[:ptr] + self.n2s(newoff, 4) + tiff[ptr+4:]
                 # remember strip offsets location
                 if tag == 0x0111:
                     strip_off = newoff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/filter/_tests/test_filter.py	Sat Jul 21 02:32:43 2007 +0200
@@ -0,0 +1,64 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - tests for MoinMoin.filter module
+
+    @copyright: 2007 by MoinMoin:ThomasWaldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+import py
+from MoinMoin import filter
+
+class TestFilters:
+
+    def make_file(self, data):
+        import tempfile
+        fname = tempfile.mktemp()
+        f = file(fname, 'w')
+        f.write(data)
+        f.close()
+        return fname
+
+    def testBinaryGeneric(self):
+        from MoinMoin.filter.application_octet_stream import execute as _filter
+        tests = [('', ''),
+                 ('this\x00is\x00a\x00test\x00', u'this test'), # throws away short stuff
+                ]
+        for data, expected in tests:
+            fname = self.make_file(data)
+            assert _filter(None, fname) == expected
+
+    def testTextGeneric(self):
+        from MoinMoin.filter.text import execute as _filter
+        tests = [('', ''),
+                 ('asdf\r\nghjk', u'asdf\r\nghjk'),
+                 # add some tests with umlauts in diff. encodings
+                ]
+        for data, expected in tests:
+            fname = self.make_file(data)
+            assert _filter(None, fname) == expected
+
+    def testTextHtml(self):
+        from MoinMoin.filter.text_html import execute as _filter
+        tests = [('', ''),
+                 ('<html><body>Hello<br>World!</body></html>', u'Hello World!'),
+                ]
+        for data, expected in tests:
+            fname = self.make_file(data)
+            assert _filter(None, fname) == expected
+
+    def testTextXml(self):
+        from MoinMoin.filter.text_xml import execute as _filter
+        tests = [('', ''),
+                 ('<xml><para>Hello</para><para>World!</para></xml>', u'Hello World!'),
+                ]
+        for data, expected in tests:
+            fname = self.make_file(data)
+            assert _filter(None, fname) == expected
+
+coverage_modules = ['MoinMoin.filter.text',
+                    'MoinMoin.filter.text_html',
+                    'MoinMoin.filter.text_xml',
+                    'MoinMoin.filter.application_octet_stream',
+                   ]
+
--- a/MoinMoin/formatter/_tests/test_formatter.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/formatter/_tests/test_formatter.py	Sat Jul 21 02:32:43 2007 +0200
@@ -76,3 +76,15 @@
 
         return self.request.redirectedOutput(page.send_page, content_only=1)
 
+
+coverage_modules = ['MoinMoin.formatter',
+                    'MoinMoin.formatter.text_html',
+                    'MoinMoin.formatter.text_gedit',
+                    'MoinMoin.formatter.text_xml',
+                    #'MoinMoin.formatter.text_docbook',
+                    'MoinMoin.formatter.text_plain',
+                    #'MoinMoin.formatter.dom_xml',
+                    'MoinMoin.formatter.text_python',
+                    'MoinMoin.formatter.pagelinks',
+                   ]
+
--- a/MoinMoin/formatter/text_docbook.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/formatter/text_docbook.py	Sat Jul 21 02:32:43 2007 +0200
@@ -156,7 +156,7 @@
             # try to go to higher level if needed
             if depth <= self.curdepth:
                 # number of levels we want to go higher
-                numberOfLevels = self.curdepth-depth + 1
+                numberOfLevels = self.curdepth - depth + 1
                 for dummy in range(numberOfLevels):
                     #find first non section node
                     while (self.cur.nodeName != "section" and self.cur.nodeName != "article"):
--- a/MoinMoin/formatter/text_html.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/formatter/text_html.py	Sat Jul 21 02:32:43 2007 +0200
@@ -710,7 +710,7 @@
             except OSError:
                 pass
             else:
-                mapid = 'ImageMapOf'+drawing
+                mapid = 'ImageMapOf' + drawing
                 # replace MAPNAME
                 map = map.replace('%MAPNAME%', mapid)
                 # add alt and title tags to areas
--- a/MoinMoin/macro/_tests/test_Action.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/macro/_tests/test_Action.py	Sat Jul 21 02:32:43 2007 +0200
@@ -61,3 +61,6 @@
 
         assert result == expected
 
+
+coverage_modules = ['MoinMoin.macro.Action']
+
--- a/MoinMoin/macro/_tests/test_Hits.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/macro/_tests/test_Hits.py	Sat Jul 21 02:32:43 2007 +0200
@@ -105,3 +105,5 @@
         assert result == expected
 
 
+coverage_modules = ['MoinMoin.macro.Hits']
+
--- a/MoinMoin/macro/_tests/test_ImageLink.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/macro/_tests/test_ImageLink.py	Sat Jul 21 02:32:43 2007 +0200
@@ -80,4 +80,5 @@
         assert result == expected
 
 
+coverage_modules = ['MoinMoin.macro.ImageLink']
 
--- a/MoinMoin/macro/_tests/test_macro.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/macro/_tests/test_macro.py	Sat Jul 21 02:32:43 2007 +0200
@@ -32,3 +32,6 @@
         m = macro.Macro(p)
         return m
 
+
+coverage_modules = ['MoinMoin.macro']
+
--- a/MoinMoin/mail/_tests/test_sendmail.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/mail/_tests/test_sendmail.py	Sat Jul 21 02:32:43 2007 +0200
@@ -113,3 +113,6 @@
         self.failUnlessEqual(sendmail.encodeAddress(address, self.charset),
                              expected)
 
+
+coverage_modules = ['MoinMoin.mail.sendmail']
+
--- a/MoinMoin/mail/mailimport.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/mail/mailimport.py	Sat Jul 21 02:32:43 2007 +0200
@@ -43,7 +43,7 @@
 
 def log(text):
     if debug:
-        print >>sys.stderr, text
+        print >> sys.stderr, text
 
 def decode_2044(header):
     """ Decodes header field. See RFC 2044. """
@@ -322,5 +322,5 @@
     try:
         import_mail_from_file(request, infile)
     except ProcessingError, e:
-        print >>sys.stderr, "An error occured while processing the message:", e.args
+        print >> sys.stderr, "An error occured while processing the message:", e.args
 
--- a/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/parser/_tests/test_text_moin_wiki.py	Sat Jul 21 02:32:43 2007 +0200
@@ -609,3 +609,7 @@
             html = self.parse(self.text % test)
             result = self.needle.search(html).group(1)
             assert result == expected
+
+
+coverage_modules = ['MoinMoin.parser.text_moin_wiki']
+
--- a/MoinMoin/request/__init__.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/request/__init__.py	Sat Jul 21 02:32:43 2007 +0200
@@ -9,7 +9,6 @@
 
 import os, re, time, sys, cgi, StringIO
 import logging
-import copy
 import Cookie
 
 try:
@@ -300,15 +299,15 @@
                         t = int(t)
                         maxnum, dt = limits.get(action, default_limit)
                         if t >= now - dt:
-                            events = surgedict.setdefault(id, copy.copy({}))
-                            timestamps = events.setdefault(action, copy.copy([]))
+                            events = surgedict.setdefault(id, {})
+                            timestamps = events.setdefault(action, [])
                             timestamps.append((t, surge_indicator))
                     except StandardError:
                         pass
 
             maxnum, dt = limits.get(current_action, default_limit)
-            events = surgedict.setdefault(current_id, copy.copy({}))
-            timestamps = events.setdefault(current_action, copy.copy([]))
+            events = surgedict.setdefault(current_id, {})
+            timestamps = events.setdefault(current_action, [])
             surge_detected = len(timestamps) > maxnum
 
             surge_indicator = surge_detected and "!" or ""
@@ -320,8 +319,8 @@
             if current_action != 'AttachFile': # don't add AttachFile accesses to all or picture galleries will trigger SP
                 current_action = 'all' # put a total limit on user's requests
                 maxnum, dt = limits.get(current_action, default_limit)
-                events = surgedict.setdefault(current_id, copy.copy({}))
-                timestamps = events.setdefault(current_action, copy.copy([]))
+                events = surgedict.setdefault(current_id, {})
+                timestamps = events.setdefault(current_action, [])
 
                 if kick_him: # ban this guy, NOW
                     timestamps.extend([(now + self.cfg.surge_lockout_time, "!")] * (2*maxnum))
--- a/MoinMoin/request/_tests/test_request.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/request/_tests/test_request.py	Sat Jul 21 02:32:43 2007 +0200
@@ -120,3 +120,5 @@
                              'wrong date string')
 
 
+coverage_modules = ['MoinMoin.request']
+
--- a/MoinMoin/script/export/dump.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/script/export/dump.py	Sat Jul 21 02:32:43 2007 +0200
@@ -155,9 +155,9 @@
                     pagehtml = request.redirectedOutput(page.send_page, count_hit=0, content_only=1)
                 except:
                     errcnt = errcnt + 1
-                    print >>sys.stderr, "*** Caught exception while writing page!"
-                    print >>errlog, "~" * 78
-                    print >>errlog, file # page filename
+                    print >> sys.stderr, "*** Caught exception while writing page!"
+                    print >> errlog, "~" * 78
+                    print >> errlog, file # page filename
                     import traceback
                     traceback.print_exc(None, errlog)
             finally:
@@ -186,5 +186,5 @@
 
         errlog.close()
         if errcnt:
-            print >>sys.stderr, "*** %d error(s) occurred, see '%s'!" % (errcnt, errfile)
+            print >> sys.stderr, "*** %d error(s) occurred, see '%s'!" % (errcnt, errfile)
 
--- a/MoinMoin/script/xmlrpc/mailimport.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/script/xmlrpc/mailimport.py	Sat Jul 21 02:32:43 2007 +0200
@@ -35,5 +35,5 @@
         result = s.ProcessMail(secret, xmlrpclib.Binary(input.read()))
 
         if result != "OK":
-            print >>sys.stderr, result
+            print >> sys.stderr, result
 
--- a/MoinMoin/script/xmlrpc/remote.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/script/xmlrpc/remote.py	Sat Jul 21 02:32:43 2007 +0200
@@ -38,5 +38,5 @@
         # TODO handle stdout, stderr
 
         if result != "OK":
-            print >>sys.stderr, result
+            print >> sys.stderr, result
 
--- a/MoinMoin/search/_tests/test_search.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/search/_tests/test_search.py	Sat Jul 21 02:32:43 2007 +0200
@@ -34,3 +34,6 @@
         for case in tests:
             self.assertEqual(self.parser.isQuoted(case), False)
 
+
+coverage_modules = ['MoinMoin.search']
+
--- a/MoinMoin/search/results.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/search/results.py	Sat Jul 21 02:32:43 2007 +0200
@@ -396,7 +396,7 @@
             write(f.definition_list(1))
 
             if paging:
-                hitsTo = hitsFrom+request.cfg.search_results_per_page
+                hitsTo = hitsFrom + request.cfg.search_results_per_page
                 displayHits = self.hits[hitsFrom:hitsTo]
             else:
                 displayHits = self.hits
@@ -697,7 +697,7 @@
             ]) for i in page_range])
 
         # next page available
-        if cur_page < pages-1:
+        if cur_page < pages - 1:
             textlinks.append(''.join([
                 f.url(1, href=page_url(cur_page+1)),
                 f.text(_('Next')),
--- a/MoinMoin/security/_tests/test_security.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/security/_tests/test_security.py	Sat Jul 21 02:32:43 2007 +0200
@@ -275,3 +275,5 @@
                 import shutil
                 shutil.rmtree(path, True)
 
+coverage_modules = ['MoinMoin.security']
+
--- a/MoinMoin/server/server_twisted.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/server/server_twisted.py	Sat Jul 21 02:32:43 2007 +0200
@@ -206,7 +206,7 @@
     port = 8080
     interfaces = ['']
     threads = 10
-    timeout = 15*60 # 15 minutes
+    timeout = 15 * 60 # 15 minutes
     logPath = None # moin log file
     logPath_twisted = None # Twisted log file
     virtualHosts = None
--- a/MoinMoin/support/copy.py	Sat Jul 21 02:32:09 2007 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,444 +0,0 @@
-"""This is a (modified) copy of python 2.4.2 copy.py as it was broken in:
-   Python 2.3.x, x < 5
-   Python 2.4.x, x < 1
-
-   Modifications done are minimal, so that same copy.py can work under 2.3
-   and 2.4 python (try: ... except: ... around some set stuff).
-
-Generic (shallow and deep) copying operations.
-
-Interface summary:
-
-        import copy
-
-        x = copy.copy(y)        # make a shallow copy of y
-        x = copy.deepcopy(y)    # make a deep copy of y
-
-For module specific errors, copy.Error is raised.
-
-The difference between shallow and deep copying is only relevant for
-compound objects (objects that contain other objects, like lists or
-class instances).
-
-- A shallow copy constructs a new compound object and then (to the
-  extent possible) inserts *the same objects* into it that the
-  original contains.
-
-- A deep copy constructs a new compound object and then, recursively,
-  inserts *copies* into it of the objects found in the original.
-
-Two problems often exist with deep copy operations that don't exist
-with shallow copy operations:
-
- a) recursive objects (compound objects that, directly or indirectly,
-    contain a reference to themselves) may cause a recursive loop
-
- b) because deep copy copies *everything* it may copy too much, e.g.
-    administrative data structures that should be shared even between
-    copies
-
-Python's deep copy operation avoids these problems by:
-
- a) keeping a table of objects already copied during the current
-    copying pass
-
- b) letting user-defined classes override the copying operation or the
-    set of components copied
-
-This version does not copy types like module, class, function, method,
-nor stack trace, stack frame, nor file, socket, window, nor array, nor
-any similar types.
-
-Classes can use the same interfaces to control copying that they use
-to control pickling: they can define methods called __getinitargs__(),
-__getstate__() and __setstate__().  See the documentation for module
-"pickle" for information on these methods.
-"""
-
-import types
-from copy_reg import dispatch_table
-
-class Error(Exception):
-    pass
-error = Error   # backward compatibility
-
-try:
-    from org.python.core import PyStringMap
-except ImportError:
-    PyStringMap = None
-
-__all__ = ["Error", "copy", "deepcopy"]
-
-import inspect
-def _getspecial(cls, name):
-    for basecls in inspect.getmro(cls):
-        try:
-            return basecls.__dict__[name]
-        except:
-            pass
-    else:
-        return None
-
-def copy(x):
-    """Shallow copy operation on arbitrary Python objects.
-
-    See the module's __doc__ string for more info.
-    """
-
-    cls = type(x)
-
-    copier = _copy_dispatch.get(cls)
-    if copier:
-        return copier(x)
-
-    copier = _getspecial(cls, "__copy__")
-    if copier:
-        return copier(x)
-
-    reductor = dispatch_table.get(cls)
-    if reductor:
-        rv = reductor(x)
-    else:
-        reductor = getattr(x, "__reduce_ex__", None)
-        if reductor:
-            rv = reductor(2)
-        else:
-            reductor = getattr(x, "__reduce__", None)
-            if reductor:
-                rv = reductor()
-            else:
-                copier = getattr(x, "__copy__", None)
-                if copier:
-                    return copier()
-                raise Error("un(shallow)copyable object of type %s" % cls)
-
-    return _reconstruct(x, rv, 0)
-
-
-_copy_dispatch = d = {}
-
-def _copy_immutable(x):
-    return x
-for t in (types.NoneType, int, long, float, bool, str, tuple,
-          type, xrange, types.ClassType,
-          types.BuiltinFunctionType):
-    d[t] = _copy_immutable
-try:
-    d[frozenset] = _copy_immutable
-except:
-    pass
-    
-for name in ("ComplexType", "UnicodeType", "CodeType"):
-    t = getattr(types, name, None)
-    if t is not None:
-        d[t] = _copy_immutable
-
-def _copy_with_constructor(x):
-    return type(x)(x)
-for t in (list, dict):
-    d[t] = _copy_with_constructor
-try:
-    d[set] = _copy_with_constructor
-except:
-    pass
-
-def _copy_with_copy_method(x):
-    return x.copy()
-if PyStringMap is not None:
-    d[PyStringMap] = _copy_with_copy_method
-
-def _copy_inst(x):
-    if hasattr(x, '__copy__'):
-        return x.__copy__()
-    if hasattr(x, '__getinitargs__'):
-        args = x.__getinitargs__()
-        y = x.__class__(*args)
-    else:
-        y = _EmptyClass()
-        y.__class__ = x.__class__
-    if hasattr(x, '__getstate__'):
-        state = x.__getstate__()
-    else:
-        state = x.__dict__
-    if hasattr(y, '__setstate__'):
-        y.__setstate__(state)
-    else:
-        y.__dict__.update(state)
-    return y
-d[types.InstanceType] = _copy_inst
-
-del d
-
-def deepcopy(x, memo=None, _nil=[]):
-    """Deep copy operation on arbitrary Python objects.
-
-    See the module's __doc__ string for more info.
-    """
-
-    if memo is None:
-        memo = {}
-
-    d = id(x)
-    y = memo.get(d, _nil)
-    if y is not _nil:
-        return y
-
-    cls = type(x)
-
-    copier = _deepcopy_dispatch.get(cls)
-    if copier:
-        y = copier(x, memo)
-    else:
-        try:
-            issc = issubclass(cls, type)
-        except TypeError: # cls is not a class (old Boost; see SF #502085)
-            issc = 0
-        if issc:
-            y = _deepcopy_atomic(x, memo)
-        else:
-            copier = _getspecial(cls, "__deepcopy__")
-            if copier:
-                y = copier(x, memo)
-            else:
-                reductor = dispatch_table.get(cls)
-                if reductor:
-                    rv = reductor(x)
-                else:
-                    reductor = getattr(x, "__reduce_ex__", None)
-                    if reductor:
-                        rv = reductor(2)
-                    else:
-                        reductor = getattr(x, "__reduce__", None)
-                        if reductor:
-                            rv = reductor()
-                        else:
-                            copier = getattr(x, "__deepcopy__", None)
-                            if copier:
-                                return copier(memo)
-                            raise Error(
-                                "un(deep)copyable object of type %s" % cls)
-                y = _reconstruct(x, rv, 1, memo)
-
-    memo[d] = y
-    _keep_alive(x, memo) # Make sure x lives at least as long as d
-    return y
-
-_deepcopy_dispatch = d = {}
-
-def _deepcopy_atomic(x, memo):
-    return x
-d[types.NoneType] = _deepcopy_atomic
-d[types.IntType] = _deepcopy_atomic
-d[types.LongType] = _deepcopy_atomic
-d[types.FloatType] = _deepcopy_atomic
-d[types.BooleanType] = _deepcopy_atomic
-try:
-    d[types.ComplexType] = _deepcopy_atomic
-except AttributeError:
-    pass
-d[types.StringType] = _deepcopy_atomic
-try:
-    d[types.UnicodeType] = _deepcopy_atomic
-except AttributeError:
-    pass
-try:
-    d[types.CodeType] = _deepcopy_atomic
-except AttributeError:
-    pass
-d[types.TypeType] = _deepcopy_atomic
-d[types.XRangeType] = _deepcopy_atomic
-d[types.ClassType] = _deepcopy_atomic
-d[types.BuiltinFunctionType] = _deepcopy_atomic
-
-def _deepcopy_list(x, memo):
-    y = []
-    memo[id(x)] = y
-    for a in x:
-        y.append(deepcopy(a, memo))
-    return y
-d[types.ListType] = _deepcopy_list
-
-def _deepcopy_tuple(x, memo):
-    y = []
-    for a in x:
-        y.append(deepcopy(a, memo))
-    d = id(x)
-    try:
-        return memo[d]
-    except KeyError:
-        pass
-    for i in range(len(x)):
-        if x[i] is not y[i]:
-            y = tuple(y)
-            break
-    else:
-        y = x
-    memo[d] = y
-    return y
-d[types.TupleType] = _deepcopy_tuple
-
-def _deepcopy_dict(x, memo):
-    y = {}
-    memo[id(x)] = y
-    for key, value in x.iteritems():
-        y[deepcopy(key, memo)] = deepcopy(value, memo)
-    return y
-d[types.DictionaryType] = _deepcopy_dict
-if PyStringMap is not None:
-    d[PyStringMap] = _deepcopy_dict
-
-def _keep_alive(x, memo):
-    """Keeps a reference to the object x in the memo.
-
-    Because we remember objects by their id, we have
-    to assure that possibly temporary objects are kept
-    alive by referencing them.
-    We store a reference at the id of the memo, which should
-    normally not be used unless someone tries to deepcopy
-    the memo itself...
-    """
-    try:
-        memo[id(memo)].append(x)
-    except KeyError:
-        # aha, this is the first one :-)
-        memo[id(memo)]=[x]
-
-def _deepcopy_inst(x, memo):
-    if hasattr(x, '__deepcopy__'):
-        return x.__deepcopy__(memo)
-    if hasattr(x, '__getinitargs__'):
-        args = x.__getinitargs__()
-        args = deepcopy(args, memo)
-        y = x.__class__(*args)
-    else:
-        y = _EmptyClass()
-        y.__class__ = x.__class__
-    memo[id(x)] = y
-    if hasattr(x, '__getstate__'):
-        state = x.__getstate__()
-    else:
-        state = x.__dict__
-    state = deepcopy(state, memo)
-    if hasattr(y, '__setstate__'):
-        y.__setstate__(state)
-    else:
-        y.__dict__.update(state)
-    return y
-d[types.InstanceType] = _deepcopy_inst
-
-def _reconstruct(x, info, deep, memo=None):
-    if isinstance(info, str):
-        return x
-    assert isinstance(info, tuple)
-    if memo is None:
-        memo = {}
-    n = len(info)
-    assert n in (2, 3, 4, 5)
-    callable, args = info[:2]
-    if n > 2:
-        state = info[2]
-    else:
-        state = {}
-    if n > 3:
-        listiter = info[3]
-    else:
-        listiter = None
-    if n > 4:
-        dictiter = info[4]
-    else:
-        dictiter = None
-    if deep:
-        args = deepcopy(args, memo)
-    y = callable(*args)
-    memo[id(x)] = y
-    if listiter is not None:
-        for item in listiter:
-            if deep:
-                item = deepcopy(item, memo)
-            y.append(item)
-    if dictiter is not None:
-        for key, value in dictiter:
-            if deep:
-                key = deepcopy(key, memo)
-                value = deepcopy(value, memo)
-            y[key] = value
-    if state:
-        if deep:
-            state = deepcopy(state, memo)
-        if hasattr(y, '__setstate__'):
-            y.__setstate__(state)
-        else:
-            if isinstance(state, tuple) and len(state) == 2:
-                state, slotstate = state
-            else:
-                slotstate = None
-            if state is not None:
-                y.__dict__.update(state)
-            if slotstate is not None:
-                for key, value in slotstate.iteritems():
-                    setattr(y, key, value)
-    return y
-
-del d
-
-del types
-
-# Helper for instance creation without calling __init__
-class _EmptyClass:
-    pass
-
-def _test():
-    l = [None, 1, 2L, 3.14, 'xyzzy', (1, 2L), [3.14, 'abc'],
-         {'abc': 'ABC'}, (), [], {}]
-    l1 = copy(l)
-    print l1==l
-    l1 = map(copy, l)
-    print l1==l
-    l1 = deepcopy(l)
-    print l1==l
-    class C:
-        def __init__(self, arg=None):
-            self.a = 1
-            self.arg = arg
-            if __name__ == '__main__':
-                import sys
-                file = sys.argv[0]
-            else:
-                file = __file__
-            self.fp = open(file)
-            self.fp.close()
-        def __getstate__(self):
-            return {'a': self.a, 'arg': self.arg}
-        def __setstate__(self, state):
-            for key, value in state.iteritems():
-                setattr(self, key, value)
-        def __deepcopy__(self, memo=None):
-            new = self.__class__(deepcopy(self.arg, memo))
-            new.a = self.a
-            return new
-    c = C('argument sketch')
-    l.append(c)
-    l2 = copy(l)
-    print l == l2
-    print l
-    print l2
-    l2 = deepcopy(l)
-    print l == l2
-    print l
-    print l2
-    l.append({l[1]: l, 'xyz': l[2]})
-    l3 = copy(l)
-    import repr
-    print map(repr.repr, l)
-    print map(repr.repr, l1)
-    print map(repr.repr, l2)
-    print map(repr.repr, l3)
-    l3 = deepcopy(l)
-    import repr
-    print map(repr.repr, l)
-    print map(repr.repr, l1)
-    print map(repr.repr, l2)
-    print map(repr.repr, l3)
-
-if __name__ == '__main__':
-    _test()
--- a/MoinMoin/user.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/user.py	Sat Jul 21 02:32:43 2007 +0200
@@ -329,8 +329,8 @@
         self.datetime_fmt = ""
         self.quicklinks = self._cfg.quicklinks_default
         self.subscribed_pages = self._cfg.subscribed_pages_default
-        self.email_subscribed_events = self._cfg.subscribed_events_default
-        self.jabber_subscribed_events = []
+        self.email_subscribed_events = self._cfg.email_subscribed_events_default
+        self.jabber_subscribed_events = self._cfg.jabber_subscribed_events_default
         self.theme_name = self._cfg.theme_default
         self.editor_default = self._cfg.editor_default
         self.editor_ui = self._cfg.editor_ui
--- a/MoinMoin/userprefs/changepass.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/userprefs/changepass.py	Sat Jul 21 02:32:43 2007 +0200
@@ -35,12 +35,13 @@
 
     def handle_form(self):
         _ = self._
-        form = self.request.form
+        request = self.request
+        form = request.form
 
         if form.has_key('cancel'):
             return
 
-        if self.request.request_method != 'POST':
+        if request.request_method != 'POST':
             return
 
         password = form.get('password', [''])[0]
@@ -50,15 +51,19 @@
         if password != password2:
             return _("Passwords don't match!")
 
-        # Encode password
-        if password and not password.startswith('{SHA}'):
-            try:
-                self.request.user.enc_password = user.encodePassword(password)
-                self.request.user.save()
-                return _("Your password has been changed.")
-            except UnicodeError, err:
-                # Should never happen
-                return "Can't encode password: %s" % str(err)
+        pw_checker = request.cfg.password_checker
+        if pw_checker:
+            pw_error = pw_checker(request.user.name, password)
+            if pw_error:
+                return _("Password not acceptable: %s") % pw_error
+
+        try:
+            self.request.user.enc_password = user.encodePassword(password)
+            self.request.user.save()
+            return _("Your password has been changed.")
+        except UnicodeError, err:
+            # Should never happen
+            return "Can't encode password: %s" % str(err)
 
 
     def create_form(self, create_only=False, recover_only=False):
--- a/MoinMoin/userprefs/prefs.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/userprefs/prefs.py	Sat Jul 21 02:32:43 2007 +0200
@@ -103,7 +103,7 @@
 
         if not 'jid' in theuser.auth_attribs:
             # try to get the jid
-            jid = wikiutil.clean_input(form.get('jid', [""])[0]).strip()
+            jid = wikiutil.clean_input(form.get('jid', [''])[0]).strip()
 
             jid_changed = theuser.jid != jid
             previous_jid = theuser.jid
--- a/MoinMoin/userprefs/suid.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/userprefs/suid.py	Sat Jul 21 02:32:43 2007 +0200
@@ -12,7 +12,9 @@
 from MoinMoin.widget import html
 from MoinMoin.userprefs import UserPrefBase
 
+
 class Settings(UserPrefBase):
+
     def __init__(self, request):
         """ Initialize setuid settings form. """
         UserPrefBase.__init__(self, request)
@@ -33,34 +35,28 @@
         _ = self._
         form = self.request.form
 
-        if form.has_key('cancel'):
+        if 'cancel' in form:
             return
 
-        if (wikiutil.checkTicket(self.request, self.request.form['ticket'][0]) and
-            self.request.request_method == 'POST'):
-            su_user = form.get('selected_user', [''])[0]
-            uid = user.getUserId(self.request, su_user)
+        if (wikiutil.checkTicket(self.request, self.request.form['ticket'][0])
+            and self.request.request_method == 'POST'):
+            uid = form.get('selected_user', [''])[0]
             if not uid:
                 return _("No user selected")
-            if (not self.request._setuid_real_user is None
-                and uid == self.request._setuid_real_user.id):
-                del self.request.session['setuid']
-                self.request.user = self.request._setuid_real_user
-                self.request._setuid_real_user = None
-            else:
-                theuser = user.User(self.request, uid, auth_method='setuid')
-                # set valid to True so superusers can even switch
-                # to disable accounts
-                theuser.valid = True
-                self.request.session['setuid'] = uid
-                self.request._setuid_real_user = self.request.user
-                # now continue as the other user
-                self.request.user = theuser
+            theuser = user.User(self.request, uid, auth_method='setuid')
+            if not theuser or not theuser.exists():
+                return _("No user selected")
+            # set valid to True so superusers can even switch
+            # to disable accounts
+            theuser.valid = True
+            self.request.session['setuid'] = uid
+            self.request._setuid_real_user = self.request.user
+            # now continue as the other user
+            self.request.user = theuser
             return  _("You can now change the settings of the selected user account; log out to get back to your account.")
         else:
             return None
 
-
     def _user_select(self):
         options = []
         users = user.getUserList(self.request)
@@ -71,12 +67,19 @@
             realuid = self.request.user.id
         for uid in users:
             if uid != realuid:
-                name = user.User(self.request, id=uid).name # + '/' + uid # for debugging
-                options.append((name, name))
-        options.sort()
+                name = user.User(self.request, id=uid).name
+                options.append((uid, name))
+        options.sort(lambda x, y: cmp(x[1].lower(), y[1].lower()))
 
         size = min(5, len(options))
-        current_user = self.request.user.name
+        current_user = self.request.user.id
+
+        if not options:
+            _ = self._
+            self._only = True
+            return _("You are the only user.")
+
+        self._only = False
         return util.web.makeSelection('selected_user', options, current_user, size=size)
 
     def create_form(self):
@@ -88,9 +91,13 @@
         ticket = wikiutil.createTicket(self.request)
         self.make_row('Select User', [self._user_select()], valign="top")
         form.append(html.INPUT(type="hidden", name="ticket", value="%s" % ticket))
-        self.make_row('', [html.INPUT(type="submit", name="select_user",
-                                      value=_('Select User')),
-                           ' ',
-                           html.INPUT(type="submit", name="cancel",
-                                      value=_('Cancel'))])
+        if not self._only:
+            buttons = [html.INPUT(type="submit", name="select_user",
+                                  value=_('Select User')),
+                       ' ', ]
+        else:
+            buttons = []
+        buttons.append(html.INPUT(type="submit", name="cancel",
+                                  value=_('Cancel')))
+        self.make_row('', buttons)
         return unicode(form)
--- a/MoinMoin/util/_tests/test_diff3.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_diff3.py	Sat Jul 21 02:32:43 2007 +0200
@@ -82,3 +82,5 @@
         assert result == expected, ('Expected "%(expected)s" but got "%(result)s"') % locals()
 
 
+coverage_modules = ['MoinMoin.util.diff3']
+
--- a/MoinMoin/util/_tests/test_diff_text.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_diff_text.py	Sat Jul 21 02:32:43 2007 +0200
@@ -66,3 +66,5 @@
         assert result == expected, ('Expected "%(expected)s" but got "%(result)s"') % locals()
 
 
+coverage_modules = ['MoinMoin.util.diff_text']
+
--- a/MoinMoin/util/_tests/test_lock.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_lock.py	Sat Jul 21 02:32:43 2007 +0200
@@ -128,3 +128,5 @@
         time.sleep(delay)
         lock.release()
 
+coverage_modules = ['MoinMoin.util.lock']
+
--- a/MoinMoin/util/_tests/test_pysupport.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_pysupport.py	Sat Jul 21 02:32:43 2007 +0200
@@ -124,3 +124,4 @@
                 if err.errno != errno.ENOENT:
                     raise
 
+coverage_modules = ['MoinMoin.util.pysupport']
--- a/MoinMoin/util/_tests/test_util.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_util.py	Sat Jul 21 02:32:43 2007 +0200
@@ -51,3 +51,4 @@
         expected = length
         assert result == expected, ('Expected length "%(expected)s" but got "%(result)s"') % locals()
 
+coverage_modules = ['MoinMoin.util']
--- a/MoinMoin/util/_tests/test_web.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/util/_tests/test_web.py	Sat Jul 21 02:32:43 2007 +0200
@@ -93,3 +93,6 @@
         self.assertEqual(result, expected,
                          'Expected "%(expected)s" but got "%(result)s"' % locals())
 
+
+coverage_modules = ['MoinMoin.util.web']
+
--- a/MoinMoin/widget/_tests/test_html.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/widget/_tests/test_html.py	Sat Jul 21 02:32:43 2007 +0200
@@ -64,3 +64,5 @@
             self.assertEqual(result, expected,
                              'Expected "%(expected)s" but got "%(result)s"' % locals())
 
+coverage_modules = ['MoinMoin.widget.html']
+
--- a/MoinMoin/wikidicts.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/wikidicts.py	Sat Jul 21 02:32:43 2007 +0200
@@ -8,11 +8,10 @@
 """
 import re, time
 
-from MoinMoin.support import copy
-
 from MoinMoin import caching, wikiutil, Page, logfile
 from MoinMoin.logfile.editlog import EditLog
 
+
 # Version of the internal data structure which is pickled.
 # Please increment if you have changed the structure.
 DICTS_PICKLE_VERSION = 6
--- a/MoinMoin/wikiutil.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/wikiutil.py	Sat Jul 21 02:32:43 2007 +0200
@@ -386,7 +386,7 @@
     """ Convert version number to UNIX timestamp (float).
         This must ONLY be used for display purposes.
     """
-    return v/1000000.0
+    return v / 1000000.0
 
 
 # This is the list of meta attribute names to be treated as integers.
@@ -1664,7 +1664,7 @@
         # invalid or empty ticket
         return False
     now = time.time()
-    if timestamp < now - 10*3600:
+    if timestamp < now - 10 * 3600:
         # we don't accept tickets older than 10h
         return False
     ourticket = createTicket(request, timestamp_str)
--- a/MoinMoin/wikixml/_tests/test_marshal.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/wikixml/_tests/test_marshal.py	Sat Jul 21 02:32:43 2007 +0200
@@ -54,3 +54,6 @@
         self.assertEqual(objXML, expected,
             'Expected "%(expected)s" but got "%(objXML)s"' % locals())
 
+
+coverage_modules = ['MoinMoin.wikixml.marshal']
+
--- a/MoinMoin/xmlrpc/_tests/test_multicall.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/MoinMoin/xmlrpc/_tests/test_multicall.py	Sat Jul 21 02:32:43 2007 +0200
@@ -25,3 +25,6 @@
     assert type(result[0]) == dict
     assert result[0].has_key("faultCode") and result[0].has_key("faultString")
 
+
+coverage_modules = ['MoinMoin.xmlrpc']
+
--- a/docs/CHANGES	Sat Jul 21 02:32:09 2007 +0200
+++ b/docs/CHANGES	Sat Jul 21 02:32:43 2007 +0200
@@ -42,6 +42,9 @@
     * new authentication plugin system
     * new preferences plugin system, see MoinMoin/userprefs/__init__.py
     * new notification system with an optional jabber notification bot
+    * cfg.password_checker (default: use some simple builtin checks for too
+      easy passwords and, if available, python-crack).
+      Use password_checker = None to disable password checking.
 
   Bugfixes:
     * ...
--- a/wiki/config/wikiconfig.py	Sat Jul 21 02:32:09 2007 +0200
+++ b/wiki/config/wikiconfig.py	Sat Jul 21 02:32:43 2007 +0200
@@ -95,6 +95,11 @@
     # All acl_rights_xxx options must use unicode [Unicode]
     #acl_rights_before = u"YourName:read,write,delete,revert,admin"
 
+    # The default (ENABLED) password_checker will keep users from choosing too
+    # short or too easy passwords. If you don't like this and your site has
+    # rather low security requirements, feel free to DISABLE the checker by:
+    #password_checker = None # None means "don't do any password strength checks"
+
     # Link spam protection for public wikis (Uncomment to enable)
     # Needs a reliable internet connection.
     #from MoinMoin.security.antispam import SecurityPolicy