| Index: sitescripts/urlfixer/web/submitData.py |
| =================================================================== |
| --- a/sitescripts/urlfixer/web/submitData.py |
| +++ b/sitescripts/urlfixer/web/submitData.py |
| @@ -21,26 +21,26 @@ |
| from sitescripts.utils import cached, get_config, setupStderr |
| -@url_handler("/submitData") |
| +@url_handler('/submitData') |
| def submit_data(environ, start_response): |
| - setupStderr(environ["wsgi.errors"]) |
| + setupStderr(environ['wsgi.errors']) |
| - if environ["REQUEST_METHOD"].upper() != "POST": |
| - return showError("Unsupported request method", start_response) |
| + if environ['REQUEST_METHOD'].upper() != 'POST': |
| + return showError('Unsupported request method', start_response) |
| - params = parse_qs(environ.get("QUERY_STRING", "")) |
| - requestVersion = params.get("version", ["0"])[0] |
| - data = "{}" |
| + params = parse_qs(environ.get('QUERY_STRING', '')) |
| + requestVersion = params.get('version', ['0'])[0] |
| + data = '{}' |
| try: |
| - data_length = int(environ.get("CONTENT_LENGTH", "0")) |
| + data_length = int(environ.get('CONTENT_LENGTH', '0')) |
| except ValueError: |
| data_length = 0 |
| if data_length != 0: |
| - data = environ["wsgi.input"].read(data_length) |
| + data = environ['wsgi.input'].read(data_length) |
| try: |
| data = json.loads(data) |
| except json.decoder.JSONDecodeError: |
| - return showError("Error while parsing JSON data.", start_response) |
| + return showError('Error while parsing JSON data.', start_response) |
| db = _get_db() |
| @@ -49,8 +49,8 @@ |
| db.commit() |
| - response_headers = [("Content-type", "text/plain")] |
| - start_response("200 OK", response_headers) |
| + response_headers = [('Content-type', 'text/plain')] |
| + start_response('200 OK', response_headers) |
| return [] |
| @@ -60,33 +60,33 @@ |
| def showError(message, start_response): |
| - start_response("400 Processing Error", [("Content-Type", "text/plain; charset=utf-8")]) |
| - return [message.encode("utf-8")] |
| + start_response('400 Processing Error', [('Content-Type', 'text/plain; charset=utf-8')]) |
| + return [message.encode('utf-8')] |
| def _get_db(): |
| - database = get_config().get("urlfixer", "database") |
| - dbuser = get_config().get("urlfixer", "dbuser") |
| - dbpasswd = get_config().get("urlfixer", "dbpassword") |
| - if os.name == "nt": |
| + database = get_config().get('urlfixer', 'database') |
| + dbuser = get_config().get('urlfixer', 'dbuser') |
| + dbpasswd = get_config().get('urlfixer', 'dbpassword') |
| + if os.name == 'nt': |
| return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| - use_unicode=True, charset="utf8", named_pipe=True) |
| + use_unicode=True, charset='utf8', named_pipe=True) |
| else: |
| return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| - use_unicode=True, charset="utf8") |
| + use_unicode=True, charset='utf8') |
| def _get_domain_id(db, domain): |
| cursor = db.cursor(MySQLdb.cursors.DictCursor) |
| - cursor.execute("SELECT id FROM domains WHERE domain = %s", (domain)) |
| + cursor.execute('SELECT id FROM domains WHERE domain = %s', (domain)) |
| result = cursor.fetchone() |
| if result == None: |
| - cursor.execute("INSERT INTO domains(domain) VALUES (%s)", (domain)) |
| + cursor.execute('INSERT INTO domains(domain) VALUES (%s)', (domain)) |
| return db.insert_id() |
| else: |
| - return result["id"] |
| + return result['id'] |
| def _increment_entry(db, domain_id, status): |
| cursor = db.cursor(MySQLdb.cursors.DictCursor) |
| - cursor.execute("INSERT INTO corrections(domain, status, curr_month, prev_month, curr_year, prev_year) VALUES (%s, %s, %s, %s, %s, %s) ON DUPLICATE KEY UPDATE curr_month = curr_month + 1, curr_year = curr_year + 1", (domain_id, status, 1, 0, 1, 0)) |
| + cursor.execute('INSERT INTO corrections(domain, status, curr_month, prev_month, curr_year, prev_year) VALUES (%s, %s, %s, %s, %s, %s) ON DUPLICATE KEY UPDATE curr_month = curr_month + 1, curr_year = curr_year + 1', (domain_id, status, 1, 0, 1, 0)) |