diff --git a/docs/conf.py b/docs/conf.py index e06a9370..7d8dbb27 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ source_suffix = ".rst" master_doc = "index" # General information about the project. -project = u"Burp-UI" -copyright = u"2018, Ziirish" -author = u"Ziirish" +project = "Burp-UI" +copyright = "2018, Ziirish" +author = "Ziirish" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -235,7 +235,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, "Burp-UI.tex", u"Burp-UI Documentation", u"Ziirish", "manual"), + (master_doc, "Burp-UI.tex", "Burp-UI Documentation", "Ziirish", "manual"), ] # The name of an image file (relative to this directory) to place at the top of @@ -263,7 +263,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). -man_pages = [(master_doc, "burp-ui", u"Burp-UI Documentation", [author], 1)] +man_pages = [(master_doc, "burp-ui", "Burp-UI Documentation", [author], 1)] # If true, show URL addresses after external links. # man_show_urls = False @@ -278,7 +278,7 @@ texinfo_documents = [ ( master_doc, "Burp-UI", - u"Burp-UI Documentation", + "Burp-UI Documentation", author, "Burp-UI", "Burp-UI is a web-ui for burp backup written in python with Flask and jQuery/Bootstrap.", diff --git a/requirements.txt b/requirements.txt index 5927412e..8520b3d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ -trio==0.18.0 -Flask==2.0.1 +trio==0.19.0 +Flask==2.0.3 Flask-Login==0.5.0 Flask-Babel==2.0.0 Flask-WTF==0.15.1 -flask-restx==0.5.1 +flask-restx==1.0.3 Flask-Caching==1.10.1 Flask-Session==0.4.0 WTForms==2.3.3 arrow==1.1.1 pluginbase==1.0.1 tzlocal==3.0 -pyOpenSSL==20.0.1 +pyOpenSSL==22.1.0 configobj==5.0.6 async_generator==1.10 Click==7.1.2 diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py index 52b153b8..7db025df 100644 --- a/tests/unit/test_api.py +++ b/tests/unit/test_api.py @@ -41,38 +41,38 @@ def test_server_config_parsing(client, app): asse = dict( ( ( - u"results", + "results", { - u"common": [], - u"boolean": [], - u"integer": [], - u"multi": [], - u"pair": [], - u"includes": [], - u"includes_ext": [], - u"hierarchy": [ + "common": [], + "boolean": [], + "integer": [], + "multi": [], + "pair": [], + "includes": [], + "includes_ext": [], + "hierarchy": [ { - u"children": [], - u"title": u"null", - u"dir": u"/dev", - u"full": u"/dev/null", - u"name": u"null", - u"parent": None, + "children": [], + "title": "null", + "dir": "/dev", + "full": "/dev/null", + "name": "null", + "parent": None, } ], - u"raw": "", + "raw": "", }, ), - (u"boolean", app.client.get_parser_attr("boolean_srv")), - (u"string", app.client.get_parser_attr("string_srv")), - (u"integer", app.client.get_parser_attr("integer_srv")), - (u"multi", app.client.get_parser_attr("multi_srv")), - (u"pair", app.client.get_parser_attr("pair_associations")), - (u"advanced", app.client.get_parser_attr("advanced_type")), - (u"server_doc", app.client.get_parser_attr("doc")), - (u"suggest", app.client.get_parser_attr("values")), - (u"placeholders", app.client.get_parser_attr("placeholders")), - (u"defaults", app.client.get_parser_attr("defaults")), + ("boolean", app.client.get_parser_attr("boolean_srv")), + ("string", app.client.get_parser_attr("string_srv")), + ("integer", app.client.get_parser_attr("integer_srv")), + ("multi", app.client.get_parser_attr("multi_srv")), + ("pair", app.client.get_parser_attr("pair_associations")), + ("advanced", app.client.get_parser_attr("advanced_type")), + ("server_doc", app.client.get_parser_attr("doc")), + ("suggest", app.client.get_parser_attr("values")), + ("placeholders", app.client.get_parser_attr("placeholders")), + ("defaults", app.client.get_parser_attr("defaults")), ) ) assert response.json == asse @@ -84,27 +84,27 @@ def test_client_config_parsing(client, app): asse = dict( ( ( - u"results", + "results", { - u"common": [], - u"boolean": [], - u"integer": [], - u"multi": [], - u"includes": [], - u"includes_ext": [], - u"hierarchy": [], - u"templates": [], - u"raw": None, + "common": [], + "boolean": [], + "integer": [], + "multi": [], + "includes": [], + "includes_ext": [], + "hierarchy": [], + "templates": [], + "raw": None, }, ), - (u"boolean", app.client.get_parser_attr("boolean_cli")), - (u"string", app.client.get_parser_attr("string_cli")), - (u"integer", app.client.get_parser_attr("integer_cli")), - (u"multi", app.client.get_parser_attr("multi_cli")), - (u"server_doc", app.client.get_parser_attr("doc")), - (u"suggest", app.client.get_parser_attr("values")), - (u"placeholders", app.client.get_parser_attr("placeholders")), - (u"defaults", app.client.get_parser_attr("defaults")), + ("boolean", app.client.get_parser_attr("boolean_cli")), + ("string", app.client.get_parser_attr("string_cli")), + ("integer", app.client.get_parser_attr("integer_cli")), + ("multi", app.client.get_parser_attr("multi_cli")), + ("server_doc", app.client.get_parser_attr("doc")), + ("suggest", app.client.get_parser_attr("values")), + ("placeholders", app.client.get_parser_attr("placeholders")), + ("defaults", app.client.get_parser_attr("defaults")), ) ) assert response.json == asse