Noissue - Indicate that the dump field is binary to avoid database warnings about bad UTF-8 encoding

sitescripts/reports/utils.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 79 matching lines @@
         del reportData['screenshot']
     knownIssues = len(reportData.get('knownIssues', []))
     contact = getUserId(reportData.get('email', None)) if reportData.get('email', None) else None
     dumpstr = marshal.dumps(reportData)
 
     if contact != None and isNew:
         executeQuery(cursor, 'INSERT INTO #PFX#users (id, reports) VALUES (%s, 1) ON DUPLICATE KEY UPDATE reports = reports + 1', contact)
     executeQuery(cursor,
                  '''INSERT INTO #PFX#reports (guid, type, ctime, site, comment, status, contact, hasscreenshot, knownissues, dump)
                  VALUES (%(guid)s, %(type)s, FROM_UNIXTIME(%(ctime)s), %(site)s, %(comment)s, %(status)s, %(contact)s,
-                 %(hasscreenshot)s, %(knownissues)s, %(dump)s) ON DUPLICATE KEY
+                 %(hasscreenshot)s, %(knownissues)s, _binary %(dump)s) ON DUPLICATE KEY
                  UPDATE type = %(type)s, site = %(site)s, comment = %(comment)s, status = %(status)s,
-                 hasscreenshot = %(hasscreenshot)s, knownissues = %(knownissues)s, dump = %(dump)s''',
+                 hasscreenshot = %(hasscreenshot)s, knownissues = %(knownissues)s, dump = _binary %(dump)s''',
                  {'guid': guid, 'type': reportData.get('type', None), 'ctime': reportData['time'], 'site': reportData.get('siteName', None),
                   'comment': reportData.get('comment', None), 'status': reportData.get('status', None), 'contact': contact,
                   'hasscreenshot': reportData.get('hasscreenshot', 0), 'knownissues': knownIssues, 'dump': dumpstr})
     if len(reportData['subscriptions']) > 0:
         for sn in reportData['subscriptions']:
             executeQuery(cursor, 'SELECT id FROM #PFX#subscriptions WHERE url = %s', sn['id'])
             id = cursor.fetchone()
             if id != None:
                 def filterMatch(f):
                     return any(u == sn['id'] for u in f.get('subscriptions', []))
@@ skipping 159 matching lines @@
     if os.name == 'nt':
         return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8', named_pipe=True)
     else:
         return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, use_unicode=True, charset='utf8')
 
 
 def executeQuery(cursor, query, args=None):
     tablePrefix = get_config().get('reports', 'dbprefix')
     query = re.sub(r'#PFX#', tablePrefix, query)
     cursor.execute(query, args)