← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/caps.py

  • Committer: William Grant
  • Date: 2009-01-22 04:47:42 UTC
  • mfrom: (1080.1.93 storm)
  • Revision ID: grantw@unimelb.edu.au-20090122044742-sa8gnww0ma2bm2rv
Merge Storm branch. ivle.db is dead. Watch out for the schema change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/caps.py
50
50
        # Internally, stored as an int
51
51
        if isinstance(role, Role):
52
52
            self._role = role._role
53
 
        elif isinstance(role, str):
 
53
        elif isinstance(role, basestring):
54
54
            try:
55
55
                self._role = Role._roles_to_int[role.lower()]
56
56
            except KeyError: