Merge remote-tracking branch 'upstream/groovy-devel' into groovy-devel

* upstream/groovy-devel: added check to ensure we do not fail if PyQt5 is not in sys.modules
mjyc · Dec 10, 2014 · 4cf4430 · 4cf4430
2 parents 75d13ef + df1dfd3
commit 4cf4430
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rqt_bag_plugins/src/rqt_bag_plugins/image_timeline_renderer.py b/rqt_bag_plugins/src/rqt_bag_plugins/image_timeline_renderer.py
@@ -34,7 +34,7 @@
 
 # HACK workaround for upstream pillow issue python-pillow/Pillow#400
 import sys
-if sys.modules['PyQt5']:
+if 'PyQt5' in sys.modules:
     sys.modules['PyQt5'] = None
 from PIL import Image
 from PIL.ImageQt import ImageQt

diff --git a/rqt_bag_plugins/src/rqt_bag_plugins/image_view.py b/rqt_bag_plugins/src/rqt_bag_plugins/image_view.py
@@ -34,7 +34,7 @@
 
 # HACK workaround for upstream pillow issue python-pillow/Pillow#400
 import sys
-if sys.modules['PyQt5']:
+if 'PyQt5' in sys.modules:
     sys.modules['PyQt5'] = None
 from PIL.ImageQt import ImageQt