~launchpad-results/launchpad-results/trunk

« back to all changes in this revision

Viewing changes to lib/lpresults/tracker/services/settings.py

  • Committer: Marc Tardif
  • Date: 2011-11-22 20:30:35 UTC
  • Revision ID: marc.tardif@canonical.com-20111122203035-gf3yiv7iqwgwbss0
Fixed login for user created from submission and incorrect CAPTURE devices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
        old_value = getattr(self, name)
68
68
        if isinstance(value, dict) \
69
69
           and isinstance(old_value, dict):
70
 
            for key in value.iterkeys():
 
70
            for key in value.keys():
71
71
 
72
72
                # Try to match the keys irrespectively
73
73
                # of dashes and case sensitivity
78
78
                        value[old_key] = old_type(value.pop(key))
79
79
                        break
80
80
                else:
81
 
                    return
 
81
                    del value[key]
82
82
 
83
83
            for key in old_value.iterkeys():
84
84
                if key not in value: