changeset 3909:b9deb538ff6c

merge 1.7 repo
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 29 Jul 2008 18:27:52 +0200
parents 1008dd34b71c (current diff) 4353a470388e (diff)
children 6fbfffffc4d1 dd7446b5e95c
files
diffstat 3 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/ldap_testbase.py	Mon Jul 28 21:37:22 2008 +0200
+++ b/MoinMoin/_tests/ldap_testbase.py	Tue Jul 29 18:27:52 2008 +0200
@@ -32,6 +32,8 @@
 
     # /etc/init.d/apparmor stop
 
+    Requires Python 2.4 (for subprocess module).
+
     @copyright: 2008 by Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/auth/smb_mount.py	Mon Jul 28 21:37:22 2008 +0200
+++ b/MoinMoin/auth/smb_mount.py	Tue Jul 29 18:27:52 2008 +0200
@@ -6,6 +6,8 @@
     authentication at the SMB server). This can be used if you need access
     to files on some share via the wiki, but needs more code to be useful.
 
+    Note: requires Python 2.4 (for subprocess module)
+
     @copyright: 2006-2008 MoinMoin:ThomasWaldmann
                 2007 MoinMoin:JohannesBerg
     @license: GNU GPL, see COPYING for details.
--- a/MoinMoin/script/maint/mkpagepacks.py	Mon Jul 28 21:37:22 2008 +0200
+++ b/MoinMoin/script/maint/mkpagepacks.py	Tue Jul 29 18:27:52 2008 +0200
@@ -9,9 +9,9 @@
 
 import os
 import zipfile
-from sets import Set
 from datetime import datetime
 
+from MoinMoin.support.python_compatibility import set
 from MoinMoin import wikidicts, wikiutil
 from MoinMoin.Page import Page
 from MoinMoin.packages import packLine, MOIN_PACKAGE_FILE
@@ -49,7 +49,7 @@
         request = self.request
         pageSets = {}
 
-        allPages = Set(request.rootpage.getPageList())
+        allPages = set(request.rootpage.getPageList())
 
         systemPages = wikidicts.Group(request, "SystemPagesGroup").members()
 
@@ -58,20 +58,20 @@
                 #print x + " -> " + repr(wikidicts.Group(request, x).members())
                 self.gd.addgroup(request, pagename)
 
-        langPages = Set()
+        langPages = set()
         for name, group in self.gd.dictdict.items():
-            groupPages = Set(group.members() + [name])
+            groupPages = set(group.members() + [name])
             name = name.replace("SystemPagesIn", "").replace("Group", "")
             pageSets[name] = groupPages
             langPages |= groupPages
 
-        specialPages = Set(["SystemPagesGroup"])
+        specialPages = set(["SystemPagesGroup"])
 
         masterNonSystemPages = allPages - langPages - specialPages
 
-        moinI18nPages = Set([x for x in masterNonSystemPages if x.startswith("MoinI18n")])
+        moinI18nPages = set([x for x in masterNonSystemPages if x.startswith("MoinI18n")])
 
-        nodistPages = moinI18nPages | Set(["InterWikiMap", ])
+        nodistPages = moinI18nPages | set(["InterWikiMap", ])
 
         extraPages = masterNonSystemPages - nodistPages