[Sugar-devel] [PATCH 1/2] Fix presence detection of keyboard layouts/options

Daniel Drake dsd at laptop.org
Thu Oct 6 10:58:53 EDT 2011


"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.
---
 bin/sugar-session |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

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)
-- 
1.7.6.4



More information about the Sugar-devel mailing list