changeset 3776:4a2e168399ca

branch merge
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Sun, 22 Jun 2008 18:49:26 +0200
parents c57d79281471 (current diff) e458af23d64d (diff)
children 7ce6ee352251
files MoinMoin/auth/ldap_login.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/PackagePages.py	Sun Jun 22 18:46:43 2008 +0200
+++ b/MoinMoin/action/PackagePages.py	Sun Jun 22 18:49:26 2008 +0200
@@ -217,7 +217,7 @@
                     zipname = "%d_attachment" % cnt
                     script.append(packLine(["AddAttachment", zipname, attname, page.page_name, userid, "Created by the PackagePages action."]))
                     filename = AttachFile.getFilename(self.request, page.page_name, attname)
-                    zf.write(filename.encode("cp437"), zipname)
+                    zf.write(filename, zipname)
         script += [packLine(['Print', 'Thank you for using PackagePages!'])]
 
         zf.writestr(MOIN_PACKAGE_FILE, u"\n".join(script).encode("utf-8"))
--- a/MoinMoin/auth/ldap_login.py	Sun Jun 22 18:46:43 2008 +0200
+++ b/MoinMoin/auth/ldap_login.py	Sun Jun 22 18:49:26 2008 +0200
@@ -242,7 +242,7 @@
             # method).
             logging.error("LDAP server %s failed (%s). "
                           "Trying to authenticate with next auth list entry." % (server, str(err)))
-            return ContinueLogin(user_obj, _("LDAP server %(server)s failed." % {'server': server}))
+            return ContinueLogin(user_obj, _("LDAP server %(server)s failed.") % {'server': server})
 
         except:
             logging.exception("caught an exception, traceback follows...")