Unicode fix

python/emokit/__init__.py

@@ -11,8 +11,8 @@
 """
 
 __title__ = "emokit"
-__version__ = "0.0.6"
-__build__ = 0x000006
+__version__ = "0.0.7"
+__build__ = 0x000007
 __author__ = "Cody Brocious / Kyle Machulis"
 __license__ = "Public Domain, See LICENSE"
 __copyright__ = "Copyright (c) 2010-2012, Cody Brocious, Kyle Machulis/Nonpolynomial Labs," \

python/emokit/util.py

@@ -146,19 +146,21 @@ def device_is_emotiv(device, platform):
     try:
         if platform != 'Windows':
             product_name = unicode(device.product_string)
+            vendor_name = unicode(device.manufacturer_string)
         else:
             product_name = unicode(device.product_name)
-        if "Emotiv" in device.vendor_name:
+            vendor_name = unicode(device.vendor_name)
+        if u"emotiv" in vendor_name.lower():
             is_emotiv = True
-        if "Emotiv" in product_name:
+        if u"emotiv" in product_name.lower():
             is_emotiv = True
-        if "EPOC" in product_name:
+        if u"epoc" in product_name.lower():
             is_emotiv = True
-        if "Brain Waves" in product_name:
+        if u"brain waves" in product_name.lower():
             is_emotiv = True
-        if product_name == '00000000000':
+        if product_name == u'00000000000':
             is_emotiv = True
-        if "EEG Signals" in product_name:
+        if u"eeg signals" in product_name.lower():
             is_emotiv = True
     except Exception as ex:
         print("Emotiv IsEmotivError ", sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2], " : ", ex)