From 15f478ee78f01a62468b7515eabf9bb0fc4e4fd2 Mon Sep 17 00:00:00 2001 From: Michael Herzberg Date: Wed, 15 May 2019 22:45:52 +0100 Subject: [PATCH] Use ast parser to parse ETag. --- PermissionAnalysis/grep-unused-permissions | 9 ++++----- extgrep | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/PermissionAnalysis/grep-unused-permissions b/PermissionAnalysis/grep-unused-permissions index 582f83e..3e7d749 100644 --- a/PermissionAnalysis/grep-unused-permissions +++ b/PermissionAnalysis/grep-unused-permissions @@ -25,6 +25,7 @@ import json import sys import csv from jsmin import jsmin +import ast from zipfile import ZipFile @@ -34,11 +35,9 @@ from ExtensionCrawler.js_mincer import mince_js def get_etag(headers_content): - headers_content = headers_content.replace( - '"', '\\"').replace("'", '"') - headers_json = json.loads(headers_content) - if "ETag" in headers_json: - return headers_json["ETag"] + d = ast.literal_eval(headers_content) + if "ETag" in d: + return d["ETag"] def get_name_and_version(overview_contents): diff --git a/extgrep b/extgrep index 9a54b4e..709eee8 100755 --- a/extgrep +++ b/extgrep @@ -26,6 +26,7 @@ import sys import importlib.util import csv import math +import ast from zipfile import ZipFile @@ -63,11 +64,9 @@ def import_regexs(path): def get_etag(headers_content): - headers_content = headers_content.replace( - '"', '\\"').replace("'", '"') - headers_json = json.loads(headers_content) - if "ETag" in headers_json: - return headers_json["ETag"] + d = ast.literal_eval(headers_content) + if "ETag" in d: + return d["ETag"] def get_name_and_version(overview_contents):