diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-15 18:18:15 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-23 16:14:32 (GMT) |
| commit | 814ab2ddf9337c36244929840c296b26430eb045 (patch) | |
| tree | fe37a1060a4bbf4151106274e30490ab1e7aef5b /src/sugar/graphics | |
| parent | 4d978fda14f7029dca7ec9925ac3716c56a74875 (diff) | |
PEP8 cleanup: don't use has_key()
has_key() has been deprecated for quite some time now.
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
Diffstat (limited to 'src/sugar/graphics')
| -rw-r--r-- | src/sugar/graphics/palettegroup.py | 2 | ||||
| -rw-r--r-- | src/sugar/graphics/style.py | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/sugar/graphics/palettegroup.py b/src/sugar/graphics/palettegroup.py index 05c713c..3f39163 100644 --- a/src/sugar/graphics/palettegroup.py +++ b/src/sugar/graphics/palettegroup.py @@ -26,7 +26,7 @@ _groups = {} def get_group(group_id): - if _groups.has_key(group_id): + if group_id in _groups: group = _groups[group_id] else: group = Group() diff --git a/src/sugar/graphics/style.py b/src/sugar/graphics/style.py index 2828b7f..d5f82ff 100644 --- a/src/sugar/graphics/style.py +++ b/src/sugar/graphics/style.py @@ -35,12 +35,11 @@ _TAB_CURVATURE = 1 def _compute_zoom_factor(): - if os.environ.has_key('SUGAR_SCALING'): - try: - scaling = int(os.environ['SUGAR_SCALING']) - return scaling / 100.0 - except ValueError: - logging.error('Invalid SUGAR_SCALING.') + try: + scaling = int(os.environ.get('SUGAR_SCALING', '100')) + return scaling / 100.0 + except ValueError: + logging.error('Invalid SUGAR_SCALING.') return 1.0 |