← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/moin/jaunty-security

« back to all changes in this revision

Viewing changes to MoinMoin/script/import/irclog.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2008-11-13 16:45:52 UTC
  • mfrom: (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20081113164552-49t6zf2t2o5bqigh
Tags: 1.8.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop recommendation of python-xml, the packages isn't anymore in
    sys.path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/script/import/irclog.py
89
89
                    acl = ""
90
90
                    if self.options.acl:
91
91
                        acl = "#acl %s\n" % (self.options.acl, )
92
 
                    p.saveText(acl + "#format plain\n" + decodeLinewise(fileObj.read()), 0)
 
92
                    p.saveText(acl + "#format irc\n" + decodeLinewise(fileObj.read()), 0)
93
93
                except PageEditor.Unchanged, e:
94
94
                    pass
95
95
                except PageEditor.SaveError, e: