From f7c460777ff8bd59f218b0e11579c7efbf1fd6b5 Mon Sep 17 00:00:00 2001 From: William Ballenthin Date: Fri, 3 Jul 2020 20:51:41 -0600 Subject: [PATCH] render: use list literal --- capa/render/default.py | 11 ++++++----- capa/render/verbose.py | 27 +++++++++++++-------------- setup.py | 16 +++++++++------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/capa/render/default.py b/capa/render/default.py index d7971124..bce458d2 100644 --- a/capa/render/default.py +++ b/capa/render/default.py @@ -17,11 +17,12 @@ def width(s, character_count): def render_meta(doc, ostream): - rows = [] - rows.append((width("md5", 22), width(doc["meta"]["sample"]["md5"], 82))) - rows.append(("path", doc["meta"]["sample"]["path"])) - rows.append(("timestamp", doc["meta"]["timestamp"])) - rows.append(("capa version", doc["meta"]["version"])) + rows = [ + (width("md5", 22), width(doc["meta"]["sample"]["md5"], 82)), + ("path", doc["meta"]["sample"]["path"]), + ("timestamp", doc["meta"]["timestamp"]), + ("capa version", doc["meta"]["version"]), + ] ostream.write(tabulate.tabulate(rows, tablefmt="psql")) ostream.write("\n") diff --git a/capa/render/verbose.py b/capa/render/verbose.py index e753545b..65dac839 100644 --- a/capa/render/verbose.py +++ b/capa/render/verbose.py @@ -36,20 +36,19 @@ def render_meta(ostream, doc): function count 42 total feature count 1918 """ - rows = [] - rows.append(("md5", doc["meta"]["sample"]["md5"])) - rows.append(("sha1", doc["meta"]["sample"]["sha1"])) - rows.append(("sha256", doc["meta"]["sample"]["sha256"])) - rows.append(("path", doc["meta"]["sample"]["path"])) - rows.append(("timestamp", doc["meta"]["timestamp"])) - rows.append(("capa version", doc["meta"]["version"])) - rows.append(("format", doc["meta"]["analysis"]["format"])) - rows.append(("extractor", doc["meta"]["analysis"]["extractor"])) - rows.append(("base address", hex(doc["meta"]["analysis"]["base_address"]))) - rows.append(("function count", len(doc["meta"]["counts"]["functions"]))) - rows.append( - ("total feature count", doc["meta"]["counts"]["file"] + sum(doc["meta"]["counts"]["functions"].values())) - ) + rows = [ + ("md5", doc["meta"]["sample"]["md5"]), + ("sha1", doc["meta"]["sample"]["sha1"]), + ("sha256", doc["meta"]["sample"]["sha256"]), + ("path", doc["meta"]["sample"]["path"]), + ("timestamp", doc["meta"]["timestamp"]), + ("capa version", doc["meta"]["version"]), + ("format", doc["meta"]["analysis"]["format"]), + ("extractor", doc["meta"]["analysis"]["extractor"]), + ("base address", hex(doc["meta"]["analysis"]["base_address"])), + ("function count", len(doc["meta"]["counts"]["functions"])), + ("total feature count", doc["meta"]["counts"]["file"] + sum(doc["meta"]["counts"]["functions"].values())), + ] ostream.writeln(tabulate.tabulate(rows, tablefmt="plain")) diff --git a/setup.py b/setup.py index b23bc084..a01a05ca 100644 --- a/setup.py +++ b/setup.py @@ -41,13 +41,15 @@ setuptools.setup( include_package_data=True, install_requires=requirements, extras_require={ - "dev": ["pytest", - "pytest-sugar", - "pytest-instafail", - "pytest-cov", - "pycodestyle", - "black ; python_version>'3.0'", - "isort"] + "dev": [ + "pytest", + "pytest-sugar", + "pytest-instafail", + "pytest-cov", + "pycodestyle", + "black ; python_version>'3.0'", + "isort", + ] }, zip_safe=False, keywords="capa",