← Back to branch summary

~ubuntu-branches/ubuntu/edgy/moin/edgy-security

« back to all changes in this revision

Viewing changes to MoinMoin/user.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2004-12-16 15:01:57 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20041216150157-b5k0bo5759j7g2e1
Tags: 1.2.4-1ubuntu1
Build using python2.4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/user.py
46
46
        userdictpickle = os.path.join(config.user_dir, "userdict.pickle")
47
47
        try:
48
48
            _name2id = pickle.load(open(userdictpickle))
49
 
        except (UnpicklingError,IOError,EOFError,ValueError):
 
49
        except (pickle.UnpicklingError,IOError,EOFError,ValueError):
50
50
            _name2id = {}
51
51
    id = _name2id.get(searchName, None)
52
52
    if id is None:
110
110
         ('show_fancy_diff', lambda _: _('Show fancy diffs')),
111
111
         ('wikiname_add_spaces', lambda _: _('Add spaces to displayed wiki names')),
112
112
         ('remember_me', lambda _: _('Remember login information forever')),
 
113
         ('want_trivial', lambda _: _('Subscribe to trivial changes')),
113
114
         ('disabled', lambda _: _('Disable this account forever')),
114
115
    ]
115
116
    _transient_fields =  ['id', 'valid', 'may', 'auth_username', 'trusted']
144
145
        self.trusted = 0
145
146
        self.email = ""
146
147
        self.edit_rows = config.edit_rows
147
 
        self.edit_cols = 80
 
148
        #self.edit_cols = 80
148
149
        self.tz_offset = int(float(config.tz_offset) * 3600)
149
150
        self.last_saved = str(time.time())
150
151
        self.css_url = ""
173
174
        self.show_toolbar = 1
174
175
        self.show_nonexist_qm = config.nonexist_qm
175
176
        self.show_fancy_diff = 1
 
177
        self.want_trivial = 0
176
178
        self.remember_me = 1
177
179
 
178
180
        if not self.id and not self.auth_username: