Philipp Hörist pushed to branch master at gajim / gajim

Commits: 48a1b1ff by Philipp Hörist at 2022-12-04T13:22:06+01:00 cq: Tests: Fix ruff linter errors

- - - - -

8 changed files:

- pyproject.toml - test/gtk/change_password.py - test/gtk/dataform.py - test/gtk/fake_dataform.py - test/gtk/groupchat_info.py - test/gtk/util.py - test/no_gui/test_styling.py - test/no_gui/test_text_helpers.py

Changes:

===================================== pyproject.toml ===================================== @@ -164,7 +164,7 @@ select = [ # "D", # pydocstyle "E", # pycodestyle "F", # pyflakes - "FBT", # flake8-boolean-trap + # "FBT", # flake8-boolean-trap # "I", # flake8-tidy-imports, isort "M", # Meta rules "N", # pep8-naming @@ -206,7 +206,8 @@ target-version = "py39"

[tool.ruff.per-file-ignores] "test/*" = ["E402"] -"test/no_gui/test_styling.py" = ["RUF001"] +"test/no_gui/test_styling.py" = ["RUF001", "E501"] +"test/no_gui/test_regex.py" = ["RUF001"]

[tool.ruff.mccabe]

===================================== test/gtk/change_password.py ===================================== @@ -26,14 +26,15 @@ fields = [ create_field(typ='text-single', label='Username', var='username'), create_field(typ='text-single', label='Old Password', var='old_password'), - create_field(typ='text-single', label='Mothers name', var='mother', required=True), + create_field(typ='text-single', label='Mothers name', + var='mother', required=True), ]

form = SimpleDataForm(type_='form', fields=fields)

def _apply(self, next_stage=False): if next_stage: - print(self.get_page('next_stage').get_submit_form()) + self.get_page('next_stage').get_submit_form() else: self.get_page('next_stage').set_form(form) self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT)

===================================== test/gtk/dataform.py ===================================== @@ -44,9 +44,9 @@ itner+hRS7W65wJLCJi6kp+XU1MORru7EvVkztO6ln3z4Nh123WLUNDjFUxvXaTcc6nMFcbfP1a9028z9gj2WIWqpqHu9QF/V7/CNxkeFYjA/llf+M3ulV5pdUduNZjoEtZtdLtL65vctPzc0SjmDE3uzL4XwEGaE59Wir0GODyhncVCiWBZ2GCfw2Y3y9MfwfzO5hO2 v8AIg7mWYx8/rwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMTEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggolQTkcNChoKAAAADUlIRFIAAAAoAAAAPAEAAAAAP MLFTQAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAJiS0dEAAHdihOkAAAAB3RJTUUH4gsEFzIsqSs7CAAAABBJREFUGNNj+A8CDKMkjUkAKsYq5D2hXoMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtM -TEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggg==''' +TEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggg==''' # noqa

-app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) +app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) # noqa app.css_config = MagicMock() app.css_config.get_value = MagicMock(return_value='rgb(100, 100, 255)')

@@ -118,12 +118,12 @@ <required/> </field> </x> -''' +''' # noqa

class DataFormWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Data Form Test") + Gtk.Window.__init__(self, title='Data Form Test') self.set_default_size(600, 600) options = { 'left-width': 100, @@ -135,6 +135,6 @@ def __init__(self): self.show()

win = DataFormWindow() -win.connect("destroy", Gtk.main_quit) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main()

===================================== test/gtk/fake_dataform.py ===================================== @@ -14,7 +14,8 @@

fake_form = { - 'instructions': 'This is the a long long long long long long test instruction', + 'instructions': ('This is the a long long long long long ' + 'long test instruction'), 'username': '', 'nick': '', 'password': '', @@ -41,7 +42,7 @@

class DataFormWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Data Form Test") + Gtk.Window.__init__(self, title='Data Form Test') self.set_default_size(600, 600) self._widget = FakeDataFormWidget(fake_form2) self.add(self._widget)

===================================== test/gtk/groupchat_info.py ===================================== @@ -1,7 +1,5 @@ from unittest.mock import MagicMock

-import time - import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk @@ -88,7 +86,7 @@ </field> </x> </query> -</iq>''') +</iq>''') # noqa

subject = ('Lorem ipsum dolor sit amet, consetetur sadipscing elitr sed '

===================================== test/gtk/util.py ===================================== @@ -1,3 +1,4 @@ +import logging from pathlib import Path

from gi.repository import Gdk @@ -14,10 +15,10 @@ def get_gajim_dir() -> Path: def load_style(filename: str, priority: CSSPriority) -> None: path = get_gajim_dir() / 'data' / 'style' / filename try: - with open(str(path), 'r', encoding='utf8') as file: + with open(str(path), encoding='utf8') as file: css = file.read() - except Exception as exc: - print(exc) + except Exception: + logging.exception('') return provider = Gtk.CssProvider() provider.load_from_data(bytes(css.encode('utf-8')))

===================================== test/no_gui/test_styling.py ===================================== @@ -347,7 +347,7 @@ 'http://%D9%85%D8%AB%D8%A7%D9%84.%D8%A5%D8%AE%D8%AA%D8%A8%D8%A7%D8%B1', 'http://%E4%BE%8B%E5%AD%90.%E6%B5%8B%E8%AF%95', 'http://%E0%A4%89%E0%A4%A6%E0%A4%BE%E0%A4%B9%E0%A4%B0%E0%A4%A3.%E0%A4%AA%E0%A...', - 'http://-.~_!$&%5C%27()*+,;=:%40:80%2f::::::@example.com', + "http://-.~_!$&%27()*+,;=:%40:80%2f::::::@example.com", 'http://1337.net', 'http://a.b-c.de', 'http://223.255.255.254', @@ -530,33 +530,33 @@ def test_uris(self): for uri in URIS: text = self.wrap(uri) hlinks = process_uris(text) - self.assertEqual([l.uri for l in hlinks], [uri], text) + self.assertEqual([link.uri for link in hlinks], [uri], text)

def test_invalid_uris(self): for foo in NONURIS + UNACCEPTABLE_URIS: text = self.wrap(foo) hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], [], text) + self.assertEqual([link.text for link in hlinks], [], text)

def test_jids(self): for jid in JIDS: text = self.wrap(jid) uri = jid_to_iri(jid) hlinks = process_uris(text) - self.assertEqual([(l.text, l.uri) for l in hlinks], + self.assertEqual([(link.text, link.uri) for link in hlinks], [(jid, uri)], text)

def test_nonjids(self): for foo in NONJIDS: text = self.wrap(foo) hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], [], text) + self.assertEqual([link.text for link in hlinks], [], text)

def test_uris_with_text(self): for text, results in URIS_WITH_TEXT: hlinks = process_uris(text) - self.assertEqual([l.text for l in hlinks], results, text) + self.assertEqual([link.text for link in hlinks], results, text)

-if __name__ == "__main__": +if __name__ == '__main__': unittest.main()

===================================== test/no_gui/test_text_helpers.py ===================================== @@ -13,7 +13,7 @@ def test_escape_iri_path_segment(self):

self.assertEqual( escape_iri_path_segment(''.join(chr(c) for c in range(0x20,0x7F))), - '%20!%22%23$%25&'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN' + "%20!%22%23$%25&'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN" 'OPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~', 'ASCII printable')

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/48a1b1ffbb1c071b5d5add9b17d78163b...