← 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-13 01:36:15 UTC
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:1123
Merge setup-refactor branch. This completely breaks existing installations;
every path (both filesystem and Python) has changed. Do not upgrade without
knowing what you are doing.

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, basestring):
 
53
        elif isinstance(role, str):
54
54
            try:
55
55
                self._role = Role._roles_to_int[role.lower()]
56
56
            except KeyError: