From 6ec7ba18b4ec2ecfac063b93f0e421b3aadcaa5e Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Thu, 06 Oct 2011 14:58:53 +0000 Subject: Fix presence detection of keyboard layouts/options "foo is []" is not a valid way of checking if a list is empty as this code intends. "foo" alone as a boolean operator is an equivalent length check, and also serves as a "is not None" check too. PEP8 also confirms this approach: For sequences, (strings, lists, tuples), use the fact that empty sequences are false. Signed-off-by: Daniel Drake Acked-By: Sascha Silbe Acked-by: Simon Schampijer --- diff --git a/bin/sugar-session b/bin/sugar-session index 4b714c3..a0ec14f 100755 --- a/bin/sugar-session +++ b/bin/sugar-session @@ -147,8 +147,7 @@ def setup_keyboard_cb(): layouts_list.append(layout.split('(')[0]) variants_list.append(layout.split('(')[1][:-1]) - if layouts_list is not None and layouts_list is not [] \ - and variants_list is not None and variants_list is not []: + if layouts_list and variants_list: configrec.set_layouts(layouts_list) configrec.set_variants(variants_list) @@ -159,7 +158,7 @@ def setup_keyboard_cb(): options = gconf_client.get_list(\ '/desktop/sugar/peripherals/keyboard/options', gconf.VALUE_STRING) - if options is not [] and options is not None: + if options: configrec.set_options(options) configrec.activate(engine) -- cgit v0.9.1