From e8bcf4a78c20d1939f39a5ff98cf34723ef0a280 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 13:59:52 +0100 Subject: [PATCH 01/25] bootstrap5 --- deformdemo/__init__.py | 7 ++++-- deformdemo/custom_widgets/modal.pt | 4 ++-- deformdemo/templates/form.pt | 24 +++++++++---------- deformdemo/templates/main.pt | 4 +++- deformdemo/templates/popup_example.pt | 2 +- .../templates/popup_example.pt | 2 +- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index 9dcca57a..01bf1271 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -39,7 +39,9 @@ from io import StringIO PY3 = sys.version_info[0] == 3 -PY38MIN = sys.version_info[0] == 3 and sys.version_info[1] >= 8 +PY38MIN = (sys.version_info[0] == 3 and sys.version_info[1] >= 8 and + sys.version_info[1] <= 9) +PY310MIN = sys.version_info[0] == 3 and sys.version_info[1] >= 10 if PY3: @@ -126,7 +128,8 @@ def render_form( reqts = form.get_widget_resources() printer = pprint.PrettyPrinter() - printer.format = my_safe_repr + if not PY310MIN: + printer.format = my_safe_repr output = printer.pformat(captured) captured = highlight(output, PythonLexer(), formatter) diff --git a/deformdemo/custom_widgets/modal.pt b/deformdemo/custom_widgets/modal.pt index 959f2602..375a6cc6 100644 --- a/deformdemo/custom_widgets/modal.pt +++ b/deformdemo/custom_widgets/modal.pt @@ -27,8 +27,8 @@ >
-

${field.title}

+
@@ -79,4 +79,4 @@ - \ No newline at end of file + diff --git a/deformdemo/templates/form.pt b/deformdemo/templates/form.pt index 6ed25ddb..f696eb78 100644 --- a/deformdemo/templates/form.pt +++ b/deformdemo/templates/form.pt @@ -13,31 +13,31 @@ -
-
-

Demo: ${title}

+
+
+

Demo: ${title}

-
+
-
-
-

Captured submission

+
+
+

Captured submission

-
+
-
-
-

Code +
+
+

Code (click to show in context)

-
+
diff --git a/deformdemo/templates/main.pt b/deformdemo/templates/main.pt index a7587341..1b263fd9 100644 --- a/deformdemo/templates/main.pt +++ b/deformdemo/templates/main.pt @@ -34,6 +34,8 @@ + @@ -41,7 +43,7 @@ - diff --git a/deformdemo/templates/popup_example.pt b/deformdemo/templates/popup_example.pt index dbf64e3e..cfeb05e9 100644 --- a/deformdemo/templates/popup_example.pt +++ b/deformdemo/templates/popup_example.pt @@ -31,7 +31,7 @@
-
diff --git a/unofficial-deformdemo/templates/popup_example.pt b/unofficial-deformdemo/templates/popup_example.pt index dbf64e3e..cfeb05e9 100644 --- a/unofficial-deformdemo/templates/popup_example.pt +++ b/unofficial-deformdemo/templates/popup_example.pt @@ -31,7 +31,7 @@

-
From ed970bf1cd79a086839dc164a288bce8f5ef9e5a Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 14:20:30 +0100 Subject: [PATCH 02/25] update ci py version --- .github/workflows/ci-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d3fb8c93..7bc75146 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -15,11 +15,12 @@ jobs: strategy: matrix: py: - - "3.6" - "3.7" - "3.8" - "3.9" - - "pypy3" + - "3.10" + - "3.11" + - "pypy-3.8" os: - "ubuntu-latest" architecture: From 23e57fc758d0e0732f8ace8945258a2ac0ab177c Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 14:26:42 +0100 Subject: [PATCH 03/25] update tox python version --- tox.ini | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 1de24f1b..7d4cd54a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ [tox] envlist = lint, - py36, py37, py38, py39, + py310, + py311, pypy3 [testenv] @@ -19,7 +20,7 @@ deps = docker [testenv:lint] -basepython = python3.9 +basepython = python3.11 commands = flake8 deformdemo setup.py isort --check-only --diff deformdemo setup.py @@ -31,7 +32,7 @@ extras = [testenv:format] skip_install = true -basepython = python3.9 +basepython = python3.11 commands = isort deformdemo setup.py black deformdemo setup.py From 3e1b80b5cdfe2d24468bf5cf7e9a3d592f19218d Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 14:32:06 +0100 Subject: [PATCH 04/25] update tox python version --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 7bc75146..c6bae2e0 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -60,7 +60,7 @@ jobs: - name: Setup python uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.11 architecture: x64 - run: | pip install tox From 7b8bb5e5717d293fdb6b3e60408e7ea31d0a6418 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 14:39:10 +0100 Subject: [PATCH 05/25] use , sperator in tox passenv --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7d4cd54a..6f31e8fe 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ envlist = [testenv] usedevelop = true -passenv = DISPLAY WEBDRIVER URL WAITTOSTART CONTAINERTZ +passenv = DISPLAY, WEBDRIVER, URL, WAITTOSTART, CONTAINERTZ whitelist_externals = tox.sh commands = pip install -Ur requirements-dev.txt From 19b703b7ecfcb02cb46d3bf2faa5fc0fb6c15954 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 14:53:20 +0100 Subject: [PATCH 06/25] use allowlist_externals --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6f31e8fe..e8682111 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ envlist = [testenv] usedevelop = true passenv = DISPLAY, WEBDRIVER, URL, WAITTOSTART, CONTAINERTZ -whitelist_externals = tox.sh +allowlist_externals = tox.sh commands = pip install -Ur requirements-dev.txt pip freeze From e4700214d21873aecea09d28333fb1b9b98486b8 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 15:10:06 +0100 Subject: [PATCH 07/25] add './' in allowlist_externals --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index e8682111..57236aed 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ envlist = [testenv] usedevelop = true passenv = DISPLAY, WEBDRIVER, URL, WAITTOSTART, CONTAINERTZ -allowlist_externals = tox.sh +allowlist_externals = ./tox.sh commands = pip install -Ur requirements-dev.txt pip freeze From 713b669be98f33e7ec6db74c6007792fc77508ae Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 15:16:01 +0100 Subject: [PATCH 08/25] pin selenium version --- setup.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 77a67404..f45797ae 100644 --- a/setup.py +++ b/setup.py @@ -26,8 +26,6 @@ def readfile(name): CHANGES = readfile("CHANGES.txt") VERSION = '3.0.0.dev0' -PY37MIN = sys.version_info[0] == 3 and sys.version_info[1] >= 7 - requires = [ "Babel", "deform >= 2.0.15.dev0", # .dev0 allows pre-releases. @@ -50,11 +48,7 @@ def readfile(name): testing_extras = ["flaky", "pytest"] -# Selenium 4.0 does not work on Python 3.6. -if PY37MIN: - testing_extras.extend(["selenium >= 4.0.0.b4"]) -else: - testing_extras.extend(["selenium >= 3.0, < 4.0"]) +testing_extras.extend(["selenium >= 4.0.0.b4, < 4.9.0"]) setup( name="deformdemo", From eacf0eea760dd8a3922cc62cf7777d6cd7ee5168 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 19:32:18 +0100 Subject: [PATCH 09/25] fix select2 test --- deformdemo/test.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 5662655d..73361505 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -2555,19 +2555,12 @@ def test_submit_default(self): self.assertEqual(findid("captured").text, "None") def test_submit_selected(self): - action_chains_xpath_on_select( - "//select[@name='pepper']/option" - ).click().send_keys(Keys.ARROW_DOWN).send_keys(Keys.ENTER).perform() - findid("deformsubmit").click() - self.assertRaises(NoSuchElementException, findcss, ".is-invalid") - self.assertTrue( - findid("captured").text in self.first_selected_captured - ) + self.assertTrue(findcss(".is-invalid").is_displayed()) - action_chains_xpath_on_select( - "//select[@name='pepper']/option[@selected='selected']" - ).click().send_keys(Keys.ARROW_DOWN).send_keys(Keys.ENTER).perform() + findcss("[data-select2-id='1']").click() + findcss(".select2-search__field").send_keys("haba") + findcss(".select2-results li[aria-selected='false']").click() findid("deformsubmit").click() self.assertTrue( findid("captured").text in self.second_selected_captured From 21fb4097e45002d455135dd7c103c9c071692f5f Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 8 Nov 2023 19:41:31 +0100 Subject: [PATCH 10/25] fix select2 test --- deformdemo/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 73361505..de4e5529 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -2559,7 +2559,7 @@ def test_submit_selected(self): self.assertTrue(findcss(".is-invalid").is_displayed()) findcss("[data-select2-id='1']").click() - findcss(".select2-search__field").send_keys("haba") + findcss(".select2-search__field").send_keys("jala") findcss(".select2-results li[aria-selected='false']").click() findid("deformsubmit").click() self.assertTrue( From 0c6c62a1b496bc12255cac8645a34da99feb724d Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 10:51:35 +0100 Subject: [PATCH 11/25] fix select2 multiple test --- deformdemo/test.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index de4e5529..35e7072d 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -2571,9 +2571,8 @@ class Select2WidgetMultipleTests(Base, unittest.TestCase): url = test_url("/select2_with_multiple/") def test_submit_selected(self): - action_chains_xpath_on_select( - "//select[@name='pepper']/option" - ).click().send_keys(Keys.ARROW_DOWN).send_keys( + findcss("[data-select2-id='1']").click() + findcss(".select2-search__field").send_keys( Keys.ARROW_DOWN ).send_keys( Keys.ARROW_DOWN @@ -2583,9 +2582,10 @@ def test_submit_selected(self): time.sleep(1) - action_chains_xpath_on_select( - "//option[contains(text(), 'Chipotle')]" - ).click().send_keys(Keys.ARROW_UP).send_keys(Keys.ARROW_UP).send_keys( + findcss("[data-select2-id='1']").click() + findcss(".select2-search__field").send_keys( + Keys.ARROW_DOWN + ).send_keys( Keys.ARROW_UP ).send_keys( Keys.ENTER From 305c479a0fd3dda1565ecc910fcf3d84b274b447 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 12:06:07 +0100 Subject: [PATCH 12/25] fix select2 multiple test --- deformdemo/test.py | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 35e7072d..8a56a370 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -2572,28 +2572,41 @@ class Select2WidgetMultipleTests(Base, unittest.TestCase): def test_submit_selected(self): findcss("[data-select2-id='1']").click() - findcss(".select2-search__field").send_keys( + search_field = findcss(".select2-search__field") + search_field.send_keys( Keys.ARROW_DOWN - ).send_keys( + ) + search_field.send_keys( Keys.ARROW_DOWN - ).send_keys( + ) + search_field.send_keys( Keys.ENTER - ).perform() + ) time.sleep(1) findcss("[data-select2-id='1']").click() - findcss(".select2-search__field").send_keys( + search_field = findcss(".select2-search__field") + search_field.send_keys( Keys.ARROW_DOWN - ).send_keys( + ) + search_field.send_keys( Keys.ARROW_UP - ).send_keys( + ) + search_field.send_keys( + Keys.ARROW_UP + ) + search_field.send_keys( Keys.ENTER - ).perform() + ) + + captured_default = {"pepper": set(["chipotle", "habanero"])} + + selected = set([x.get_property("title").lower() for x in findcsses(".select2-selection__choice")]) + self.assertEqual(selected, captured_default["pepper"]) findid("deformsubmit").click() - captured_default = {"pepper": set(["chipotle", "habanero"])} self.assertEqual(eval(findid("captured").text), captured_default) self.assertRaises(NoSuchElementException, findcss, ".is-invalid") From c89ec781130ff960466afa83bed5b3555ec35147 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 12:38:40 +0100 Subject: [PATCH 13/25] fix select2 X test --- deformdemo/test.py | 54 +++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 8a56a370..6d389f13 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -2639,26 +2639,25 @@ def test_render_default(self): self.assertEqual(len(findxpaths("//optgroup")), 2) def test_submit_selected(self): - action_chains_xpath_on_select( - "//select[@name='musician']/option" - ).click().send_keys(Keys.ARROW_DOWN).send_keys(Keys.ENTER).perform() + findcss("[data-select2-id='1']").click() + search_field = findcss(".select2-search__field") + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ENTER) findid("deformsubmit").click() self.assertRaises(NoSuchElementException, findcss, ".is-invalid") captured = findid("captured").text - self.assertSimilarRepr(captured, self.first_selected_captured) + self.assertEqual(captured, self.first_selected_captured) time.sleep(1) - action_chains_xpath_on_select( - "//option[contains(text(), 'Page')]" - ).click().send_keys(Keys.ARROW_DOWN).send_keys( - Keys.ARROW_DOWN - ).send_keys( - Keys.ARROW_DOWN - ).send_keys( - Keys.ENTER - ).perform() + findcss("[data-select2-id='1']").click() + search_field = findcss(".select2-search__field") + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ENTER) + findid("deformsubmit").click() self.assertTrue( findid("captured").text in self.second_selected_captured @@ -2669,25 +2668,22 @@ class Select2TagsWidgetTests(Base, unittest.TestCase): url = test_url("/select2_with_tags/") def test_submit_new_option(self): - # open select search field findcss(".select2-container").click() # options list is empty - self.assertSimilarRepr( + self.assertEqual( findid("select2-deformField1-results").text, "No results found" ) # type a value in select2 search - ( - findid("public") - .find_element(By.CSS_SELECTOR, ".select2-search__field") - .send_keys("hello\n") - ) + search_field = findcss(".select2-search__field") + search_field.send_keys("hello\n") + search_field.send_keys(Keys.ENTER) # after form submission typed value appear in captured findid("deformsubmit").click() captured = findid("captured").text - self.assertSimilarRepr( + self.assertEqual( captured, "{'pepper': 'hello'}", ) @@ -2702,8 +2698,9 @@ def test_submit_new_options(self): # options list is empty findid("item-deformField1").click() - self.assertSimilarRepr( - findid("select2-deformField1-results").text, "No results found" + self.assertEqual( + findid("select2-deformField1-results").text, + "No results found", ) # adding values to select field @@ -2711,11 +2708,10 @@ def test_submit_new_options(self): # open select search field findid("item-deformField1").click() # type values in selec2 search - ( - findid("public") - .find_element(By.CSS_SELECTOR, ".select2-search__field") - .send_keys(value + "\n") - ) + + search_field = findcss(".select2-search__field") + search_field.send_keys(value + "\n") + search_field.send_keys(Keys.ENTER) # after form submission typed value appear in captured findid("deformsubmit").click() @@ -2723,7 +2719,7 @@ def test_submit_new_options(self): expected = "{'pepper': {'hello', 'qwerty'}}" if PY3: captured = sort_set_values(captured) - self.assertSimilarRepr(captured, expected) + self.assertEqual(captured, expected) class SelectizeWidgetTests(Base, unittest.TestCase): From 630d6d38bd35f4634f73083ab53cbde2b759e913 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 14:24:36 +0100 Subject: [PATCH 14/25] fix selenium tests --- deformdemo/test.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 6d389f13..7fd76016 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -204,6 +204,9 @@ def wait_to_click(selector): # SO FUN! time.sleep(0.2) continue + if isinstance(e, ElementNotInteractableException): + time.sleep(0.2) + continue raise @@ -3597,8 +3600,12 @@ def test_submit_success(self): findid("deformField4").send_keys("2010") findid("deformField4-month").send_keys("1") findid("deformField4-day").send_keys("1") - browser.switch_to.frame(browser.find_element(By.TAG_NAME, "iframe")) - findid("tinymce").send_keys("yo") + # enter iframe + browser.switch_to.frame("deformField5_ifr") + tinymce = findid("tinymce") + tinymce.click() + tinymce.send_keys("yo") + # leave iframe browser.switch_to.default_content() source = browser.page_source wait_to_click("#deformsubmit") @@ -3788,7 +3795,8 @@ def test_render_select_single_default(self): self.assertTrue(options[1].get_attribute("readonly"), "readonly") self.assertTrue(options[2].get_attribute("disabled"), "disabled") - select_object.select_by_index(0) + # XXX: You may not select a disabled option + self.assertRaises(NotImplementedError, select_object.select_by_index, 0) self.assertTrue(options[1].is_selected()) def test_render_selectize_multi_default(self): From d6a317bddf243da55c9f5814f55c87968902ce69 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 14:54:55 +0100 Subject: [PATCH 15/25] fix linting && use new python, pypy version --- .github/workflows/ci-tests.yml | 4 +-- deformdemo/__init__.py | 46 +++++--------------------------- deformdemo/mini.py | 2 -- deformdemo/test.py | 48 ++++++++++++---------------------- setup.py | 2 -- tox.ini | 2 +- 6 files changed, 26 insertions(+), 78 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c6bae2e0..d1db78d5 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -15,12 +15,12 @@ jobs: strategy: matrix: py: - - "3.7" - "3.8" - "3.9" - "3.10" - "3.11" - - "pypy-3.8" + - "3.12" + - "pypy-3.10" os: - "ubuntu-latest" architecture: diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index 01bf1271..8bd6ac31 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -39,8 +39,11 @@ from io import StringIO PY3 = sys.version_info[0] == 3 -PY38MIN = (sys.version_info[0] == 3 and sys.version_info[1] >= 8 and - sys.version_info[1] <= 9) +PY38MIN = ( + sys.version_info[0] == 3 + and sys.version_info[1] >= 8 + and sys.version_info[1] <= 9 +) PY310MIN = sys.version_info[0] == 3 and sys.version_info[1] >= 10 if PY3: @@ -71,7 +74,7 @@ def __call__(self, method): # http://stackoverflow.com/a/16888673/315168 # eliminate u'' def my_safe_repr(obj, context, maxlevels, level, sort_dicts=True): - if type(obj) == unicode: + if type(obj) is unicode: obj = obj.encode("utf-8") # Python 3.8 changed the call signature of pprint._safe_repr. @@ -97,7 +100,6 @@ def render_form( readonly=False, is_i18n=False, ): - captured = None if submitted in self.request.POST: @@ -262,7 +264,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="textinput_with_css_class") @demonstrate("Text Input Widget (with CSS class)") def textinput_with_css_class(self): - css_widget = deform.widget.TextInputWidget( css_class="deform-widget-with-style" ) @@ -297,7 +298,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="money_input") @demonstrate("Money Input") def money_input(self): - widget = deform.widget.MoneyInputWidget(options={"allowZero": True}) class Schema(colander.Schema): @@ -338,7 +338,6 @@ class Schema(colander.Schema): ) @demonstrate("Autocomplete Input Widget (with Remote Data Source)") def autocomplete_remote_input(self): - widget = deform.widget.AutocompleteInputWidget( min_length=1, values=self.request.route_path( @@ -422,7 +421,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="richtext_i18n") @demonstrate("Rich Text Widget (internationalized)") def richtext_i18n(self): - locale_name = get_locale_name(self.request) class Schema(colander.Schema): @@ -604,7 +602,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="radiochoice") @demonstrate("Radio Choice Widget") def radiochoice(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -628,7 +625,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="radiochoice_inline") @demonstrate("Radio Choice Widget (inline)") def radiochoice_inline(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -673,7 +669,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="radiochoice_readonly") @demonstrate("Radio Choice Widget (read-only)") def radiochoice_readonly(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -696,7 +691,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkedinput") @demonstrate("Checked Input Widget") def checkedinput(self): - widget = deform.widget.CheckedInputWidget( subject="Email", confirm_subject="Confirm Email" ) @@ -718,7 +712,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkedinput_readonly") @demonstrate("Checked Input Widget (read-only)") def checkedinput_readonly(self): - widget = deform.widget.CheckedInputWidget( subject="Email", confirm_subject="Confirm Email", readonly=True ) @@ -790,7 +783,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkedinput_withmask") @demonstrate("Checked Input Widget (with Input Mask)") def checkedinput_withmask(self): - widget = deform.widget.CheckedInputWidget( subject="SSN", confirm_subject="Confirm SSN", @@ -815,7 +807,6 @@ class Schema(colander.Schema): @demonstrate("Dynamic fields: add and remove") def dynamic_field(self): class Schema(colander.Schema): - field1 = colander.SchemaNode( colander.String(), title="Field 1", @@ -829,7 +820,6 @@ class Schema(colander.Schema): ) def after_bind(self, schema, kwargs): - # after_bind() can be used as subclass method # or a parameter passed to schema constructor. # @@ -1015,7 +1005,6 @@ def succeed(): @view_config(renderer="templates/form.pt", name="sequence_of_radiochoices") @demonstrate("Sequence of Radio Choice Widgets") def sequence_of_radiochoices(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -1688,7 +1677,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select") @demonstrate("Select Widget") def select(self): - choices = ( ("", "- Select -"), ("habanero", "Habanero"), @@ -1710,7 +1698,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select_with_size") @demonstrate("Select Widget (with size)") def select_with_size(self): - choices = ( ("", "- Select -"), ("habanero", "Habanero"), @@ -1732,7 +1719,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select_with_unicode") @demonstrate("Select Widget (with unicode)") def select_with_unicode(self): - choices = ( ("", "- Select -"), (unicode("ハバネロ", "utf-8"), "Habanero"), @@ -1754,7 +1740,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select_with_default") @demonstrate("Select Widget (with default)") def select_with_default(self): - choices = ( ("", "- Select -"), ("habanero", "Habanero"), @@ -1777,7 +1762,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select_with_multiple") @demonstrate("Select Widget (with multiple)") def select_with_multiple(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -1803,7 +1787,6 @@ class Schema(colander.Schema): ) @demonstrate("Select Widget (with multiple default integers)") def select_with_multiple_default_integers(self): - choices = ((1, "Habanero"), (2, "Jalapeno"), (3, "Chipotle")) class Schema(colander.Schema): @@ -1854,7 +1837,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select_integer") @demonstrate("Select Widget (with Integer values)") def select_integer(self): - choices = (("", "- Select -"), (0, "Zero"), (1, "One"), (2, "Two")) class Schema(colander.Schema): @@ -1904,7 +1886,6 @@ class Schema(colander.Schema): ) @demonstrate("Select Widget (with optgroup and label attributes)") def select_with_optgroup_and_label_attributes(self): - # One may or may not notice any difference with # 'select_with_optgroup' above, depending on the browser being # used. See widget's documentation for further details. @@ -1987,7 +1968,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select2") @demonstrate("Select2 Widget") def select2(self): - choices = ( ("", "- Select -"), ("habanero", "Habanero"), @@ -2009,7 +1989,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select2_with_multiple") @demonstrate("Select2 Widget (with multiple)") def select2_with_multiple(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2062,7 +2041,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="select2_with_tags") @demonstrate("Select2 Widget (with tags)") def select2_with_tags(self): - choices = () class Schema(colander.Schema): @@ -2081,7 +2059,6 @@ class Schema(colander.Schema): ) @demonstrate("Select2 Widget (with tags and multiple)") def select2_with_tags_and_multiple(self): - choices = () class Schema(colander.Schema): @@ -2100,7 +2077,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="selectize") @demonstrate("Selectize Widget") def selectize(self): - choices = ( ("", "- Select -"), ("habanero", "Habanero"), @@ -2122,7 +2098,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="selectize_with_multiple") @demonstrate("Selectize Widget (with multiple)") def selectize_with_multiple(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2187,7 +2162,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="selectize_with_tags") @demonstrate("Selectize Widget (with tags)") def selectize_with_tags(self): - choices = () class Schema(colander.Schema): @@ -2216,7 +2190,6 @@ class Schema(colander.Schema): ) @demonstrate("Selectize Widget (with tags and multiple)") def selectize_with_tags_and_multiple(self): - choices = () class Schema(colander.Schema): @@ -2247,7 +2220,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkboxchoice") @demonstrate("Checkbox Choice Widget") def checkboxchoice(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2269,7 +2241,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkboxchoice_inline") @demonstrate("Checkbox Choice Widget (inline)") def checkboxchoice_inline(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2293,7 +2264,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkboxchoice2") @demonstrate("Checkbox Choice Widget (with required field)") def checkboxchoice2(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2319,7 +2289,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="checkboxchoice_readonly") @demonstrate("Checkbox Choice Widget (read-only)") def checkboxchoice_readonly(self): - choices = ( ("habanero", "Habanero"), ("jalapeno", "Jalapeno"), @@ -2344,7 +2313,6 @@ class Schema(colander.Schema): @view_config(renderer="templates/form.pt", name="i18n") @demonstrate("Internationalization") def i18n(self): - minmax = {"min": 1, "max": 10} locale_name = get_locale_name(self.request) @@ -2588,7 +2556,7 @@ class Schema2(colander.Schema): if "submit" in self.request.POST: posted_formid = self.request.POST["__formid__"] - for (formid, form) in [("form1", form1), ("form2", form2)]: + for formid, form in [("form1", form1), ("form2", form2)]: if formid == posted_formid: try: controls = self.request.POST.items() diff --git a/deformdemo/mini.py b/deformdemo/mini.py index 8d351f86..a90957b2 100644 --- a/deformdemo/mini.py +++ b/deformdemo/mini.py @@ -10,7 +10,6 @@ class ExampleSchema(deform.schema.CSRFSchema): - name = colander.SchemaNode(colander.String(), title="Name") age = colander.SchemaNode( @@ -33,7 +32,6 @@ def mini_example(request): # User submitted this form if request.method == "POST": if "process" in request.POST: - try: appstruct = form.validate(request.POST.items()) diff --git a/deformdemo/test.py b/deformdemo/test.py index 7fd76016..69efd948 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import print_function - import ast import datetime from decimal import Decimal @@ -60,7 +58,6 @@ def give_selenium_some_time(func): """ def inner(*args, **kwargs): - deadline = time.time() + SELENIUM_IMPLICIT_WAIT sleep = 0.03 @@ -193,7 +190,6 @@ def wait_to_click(selector): # Haha what a gotcha! time.sleep(0.2) except Exception as e: - if isinstance(e, StaleElementReferenceException): # Look all these exceptions we can get! time.sleep(0.2) @@ -261,14 +257,12 @@ def setUpModule(): driver_name = os.environ.get("WEBDRIVER") if driver_name == "selenium_local_chrome": - from selenium.webdriver import Chrome browser = Chrome() return browser elif driver_name == "selenium_container_chrome": - from selenium_containers import start_chrome from selenium.webdriver import DesiredCapabilities @@ -289,7 +283,6 @@ def setUpModule(): return browser elif driver_name == "selenium_container_opera": - from selenium_containers import start_opera from selenium.webdriver import DesiredCapabilities @@ -310,7 +303,6 @@ def setUpModule(): return browser elif driver_name == "selenium_container_firefox": - from selenium_containers import start_firefox from selenium.webdriver import DesiredCapabilities @@ -331,7 +323,6 @@ def setUpModule(): return browser elif driver_name == "selenium_local_firefox": - from selenium import webdriver try: @@ -2576,36 +2567,27 @@ class Select2WidgetMultipleTests(Base, unittest.TestCase): def test_submit_selected(self): findcss("[data-select2-id='1']").click() search_field = findcss(".select2-search__field") - search_field.send_keys( - Keys.ARROW_DOWN - ) - search_field.send_keys( - Keys.ARROW_DOWN - ) - search_field.send_keys( - Keys.ENTER - ) + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ENTER) time.sleep(1) findcss("[data-select2-id='1']").click() search_field = findcss(".select2-search__field") - search_field.send_keys( - Keys.ARROW_DOWN - ) - search_field.send_keys( - Keys.ARROW_UP - ) - search_field.send_keys( - Keys.ARROW_UP - ) - search_field.send_keys( - Keys.ENTER - ) + search_field.send_keys(Keys.ARROW_DOWN) + search_field.send_keys(Keys.ARROW_UP) + search_field.send_keys(Keys.ARROW_UP) + search_field.send_keys(Keys.ENTER) captured_default = {"pepper": set(["chipotle", "habanero"])} - selected = set([x.get_property("title").lower() for x in findcsses(".select2-selection__choice")]) + selected = set( + [ + x.get_property("title").lower() + for x in findcsses(".select2-selection__choice") + ] + ) self.assertEqual(selected, captured_default["pepper"]) findid("deformsubmit").click() @@ -3796,7 +3778,9 @@ def test_render_select_single_default(self): self.assertTrue(options[2].get_attribute("disabled"), "disabled") # XXX: You may not select a disabled option - self.assertRaises(NotImplementedError, select_object.select_by_index, 0) + self.assertRaises( + NotImplementedError, select_object.select_by_index, 0 + ) self.assertTrue(options[1].is_selected()) def test_render_selectize_multi_default(self): diff --git a/setup.py b/setup.py index f45797ae..7c5e69d0 100644 --- a/setup.py +++ b/setup.py @@ -11,8 +11,6 @@ # FITNESS FOR A PARTICULAR PURPOSE # ############################################################################## -import sys - from setuptools import find_packages from setuptools import setup diff --git a/tox.ini b/tox.ini index 57236aed..c3cfab79 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,11 @@ [tox] envlist = lint, - py37, py38, py39, py310, py311, + py312, pypy3 [testenv] From e3897ef0b2ba2624143292c9697732957144cd4e Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 15:05:18 +0100 Subject: [PATCH 16/25] fix flake8 --- deformdemo/scripts/html5check.py | 2 +- deformdemo/validation.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deformdemo/scripts/html5check.py b/deformdemo/scripts/html5check.py index 97eef203..6f5f5ed1 100644 --- a/deformdemo/scripts/html5check.py +++ b/deformdemo/scripts/html5check.py @@ -26,7 +26,7 @@ import string import sys -from six.moves import input +from six.moves import input # noqa: A004 # Several "try" blocks for python2/3 differences (@secretrobotron) diff --git a/deformdemo/validation.py b/deformdemo/validation.py index 4c3c9a0e..b0d9d297 100644 --- a/deformdemo/validation.py +++ b/deformdemo/validation.py @@ -7,7 +7,7 @@ import StringIO import httplib -from six.moves import input +from six.moves import input # noqa: A004 import urlparse # Deform Demo From fab4d940ac23031af462be765efd1f7547863a1b Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 15:49:07 +0100 Subject: [PATCH 17/25] fix restructured text https://stackoverflow.com/a/39720161/1154966 does not work --- README.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 5ccab392..0f6d28f9 100644 --- a/README.rst +++ b/README.rst @@ -108,8 +108,8 @@ It performs editable installs of Colander and Deform into your virtual environme Install Firefox latest ^^^^^^^^^^^^^^^^^^^^^^ -macOS -""""" +macOS Firefox +""""""""""""" `Download the latest version of Firefox for your platform `_. @@ -119,8 +119,8 @@ Open the ``.dmg`` (macOS), and drag the Firefox icon to: ~/projects/deformdemo/ -Linux (Debian) -"""""""""""""" +Linux (Debian) Firefox +"""""""""""""""""""""" Use cURL or wget. See the `Firefox download README.txt `_ for instructions. @@ -161,8 +161,8 @@ gettext The functional tests require the installation of the GNU ``gettext`` utilities, specifically ``msgmerge`` and ``msgfmt``. Use your package manager to install these requirements. -macOS -""""" +macOS gettext +""""""""""""" Use `Homebrew `_. @@ -177,8 +177,8 @@ If you ever have problems building packages, you can always unlink it. brew unlink gettext -Linux (Debian) -"""""""""""""" +Linux (Debian) gettext +"""""""""""""""""""""" .. code-block:: bash From 9a838d2b4f7f353e12c5debe8d632bee8755ea0b Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Thu, 9 Nov 2023 19:16:30 +0100 Subject: [PATCH 18/25] fix unofficial-deformdemo (it never worked) --- unofficial-deformdemo/__init__.py | 50 ++------------ unofficial-deformdemo/templates/form.pt | 24 +++---- unofficial-deformdemo/templates/mini.pt | 66 ------------------- .../templates/popup_example.pt | 65 ------------------ 4 files changed, 18 insertions(+), 187 deletions(-) delete mode 100644 unofficial-deformdemo/templates/mini.pt delete mode 100644 unofficial-deformdemo/templates/popup_example.pt diff --git a/unofficial-deformdemo/__init__.py b/unofficial-deformdemo/__init__.py index 0fa929d2..75ad1335 100644 --- a/unofficial-deformdemo/__init__.py +++ b/unofficial-deformdemo/__init__.py @@ -5,7 +5,6 @@ import inspect import logging -import pprint import sys import colander @@ -23,17 +22,6 @@ log = logging.getLogger(__name__) - - -PY3 = sys.version_info[0] == 3 -PY38MIN = sys.version_info[0] == 3 and sys.version_info[1] >= 8 - -if PY3: - - def unicode(val, encoding="utf-8"): - return val - - _ = TranslationStringFactory("unofficial-deformdemo") formatter = HtmlFormatter(nowrap=True) @@ -51,22 +39,6 @@ def __call__(self, method): return method -# Py2/Py3 compat -# http://stackoverflow.com/a/16888673/315168 -# eliminate u'' -def my_safe_repr(obj, context, maxlevels, level, sort_dicts=True): - - if type(obj) == unicode: - obj = obj.encode("utf-8") - - # Python 3.8 changed the call signature of pprint._safe_repr. - # by adding sort_dicts. - if PY38MIN: - return pprint._safe_repr(obj, context, maxlevels, level, sort_dicts) - else: - return pprint._safe_repr(obj, context, maxlevels, level) - - @view_defaults(route_name="unofficial-deformdemo") class UnofficialDeformDemo(object): def __init__(self, request): @@ -84,6 +56,7 @@ def render_form( ): captured = None + output = None if submitted in self.request.POST: # the request represents a form submission @@ -91,6 +64,9 @@ def render_form( # try to validate the submitted values controls = self.request.POST.items() captured = form.validate(controls) + output = captured["text"] + output = highlight(output, PythonLexer(), formatter) + if success: response = success() if response is not None: @@ -112,15 +88,10 @@ def render_form( reqts = form.get_widget_resources() - printer = pprint.PrettyPrinter() - printer.format = my_safe_repr - output = printer.pformat(captured) - captured = highlight(output, PythonLexer(), formatter) - # values passed to template for rendering return { "form": html, - "captured": captured, + "captured": output, "code": code, "start": start, "end": end, @@ -137,17 +108,8 @@ def get_code(self, level): lines, start = inspect.getsourcelines(frame.f_code) end = start + len(lines) code = "".join(lines) - if not PY3: - code = unicode(code, "utf-8") return highlight(code, PythonLexer(), formatter), start, end - @view_config(name="thanks.html", route_name="unofficial-deformdemo") - def thanks(self): - return Response( - "

Thanks!

" - 'Up' - ) - @view_config(name="allcode", renderer="templates/code.pt", route_name="unofficial-deformdemo") @@ -217,7 +179,7 @@ class Schema(colander.Schema): colander.String(), validator=colander.Length(max=100), widget=deform.widget.TextInputWidget(), - description="Enter some text", + description="Enter some text (python will be highlighted)", ) schema = Schema() diff --git a/unofficial-deformdemo/templates/form.pt b/unofficial-deformdemo/templates/form.pt index 6ed25ddb..40f6b89f 100644 --- a/unofficial-deformdemo/templates/form.pt +++ b/unofficial-deformdemo/templates/form.pt @@ -13,31 +13,31 @@
-
-
-

Demo: ${title}

+
+
+

Demo: ${title}

-
+
-
-
-

Captured submission

+
+
+

Captured submission

-
+
-
-
-

Code +
+
+

Code (click to show in context)

-
+
diff --git a/unofficial-deformdemo/templates/mini.pt b/unofficial-deformdemo/templates/mini.pt deleted file mode 100644 index d9e7c7ef..00000000 --- a/unofficial-deformdemo/templates/mini.pt +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - Deform mini demo - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- ${message}
-
-
-
-
-
- -
-
-
-

Deform mini example

- -
-
-
-
- - - - - diff --git a/unofficial-deformdemo/templates/popup_example.pt b/unofficial-deformdemo/templates/popup_example.pt deleted file mode 100644 index cfeb05e9..00000000 --- a/unofficial-deformdemo/templates/popup_example.pt +++ /dev/null @@ -1,65 +0,0 @@ - -
- -
- -
- -
- - -
- -
- -
-
-

Demo: ${title}

-
- -
- -
- - -
- -
- -
-
-

Captured submission

-
-
- 
-
-
- -
-
-

Code - (click to show in context) -

-
-
- 
-
-
-
-
- From 4f617ec13a4fc96a2ef70f433b4a8773be907349 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Mon, 13 Nov 2023 20:11:38 +0100 Subject: [PATCH 19/25] removed six; reactivated validation (do we still need it?) --- deformdemo/__init__.py | 4 ++-- deformdemo/validation.py | 24 ++++++++++++------------ setup.py | 1 - 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index 8bd6ac31..cc46afa9 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -214,7 +214,7 @@ def predicate(value): L = [] for name, method in demos: url = self.request.resource_url( - self.request.root, name, route_name="deformdemo" + self.request.context, name, route_name="deformdemo" ) L.append((method.demo, url)) L.sort() @@ -982,7 +982,7 @@ class Schema(colander.Schema): def succeed(): location = self.request.resource_url( - self.request.root, "thanks.html", route_name="deformdemo" + self.request.context, "thanks.html", route_name="deformdemo" ) # To appease jquery 1.6+, we need to return something that smells # like HTML, or we get a "Node cannot be inserted at the diff --git a/deformdemo/validation.py b/deformdemo/validation.py index b0d9d297..83a3ee85 100644 --- a/deformdemo/validation.py +++ b/deformdemo/validation.py @@ -1,25 +1,26 @@ import gzip -import json import sys import unittest from pyramid.paster import bootstrap -import StringIO -import httplib -from six.moves import input # noqa: A004 -import urlparse +from io import BytesIO +import http.client +import urllib.parse # Deform Demo from deformdemo import DeformDemo +UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, " \ + "like Gecko) Chrome/119.0.0.0 Safari/537.36" + def validate(data): errorsOnly = 0 contentType = "text/html" service = "http://html5.validator.nu/" - buf = StringIO.StringIO() + buf = BytesIO() gzipper = gzip.GzipFile(fileobj=buf, mode="wb") gzipper.write(data) gzipper.close() @@ -41,7 +42,7 @@ def validate(data): ) and redirectCount < 10: if redirectCount > 0: url = response.getheader("Location") - parsed = urlparse.urlsplit(url) + parsed = urllib.parse.urlsplit(url) if parsed[0] != "http": sys.stderr.write( "URI scheme {0} not supported.\n".format(parsed[0]) @@ -56,7 +57,7 @@ def validate(data): ) if input() != "": sys.exit(0) - connection = httplib.HTTPConnection(parsed[1]) + connection = http.client.HTTPConnection(parsed[1]) connection.connect() connection.putrequest( "POST", @@ -67,6 +68,7 @@ def validate(data): connection.putheader("Content-Type", contentType) connection.putheader("Content-Encoding", "gzip") connection.putheader("Content-Length", len(gzippeddata)) + connection.putheader("User-Agent", UA) connection.endheaders() connection.send(gzippeddata) response = connection.getresponse() @@ -78,12 +80,10 @@ def validate(data): sys.exit(5) if response.getheader("Content-Encoding", "identity").lower() == "gzip": - response = gzip.GzipFile(fileobj=StringIO.StringIO(response.read())) + response = gzip.GzipFile(fileobj=BytesIO(response.read())) connection.close() return response.read() - result = json.loads(response.read()) - return result class FunctionalTests(unittest.TestCase): @@ -109,7 +109,7 @@ def test_valid_html(self): except AssertionError: errors.append((demo[0], check)) print(demo[0], "E") - print(check) + print(check.decode()) print("") # self.assertFalse(errors) diff --git a/setup.py b/setup.py index 7c5e69d0..7a897aa5 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,6 @@ def readfile(name): "pyramid >= 1.5a1", # route_name argument to resource_url "pyramid_chameleon", "pygments", - "six", "waitress", ] From 2f56ff9fb439513d9f79282d0a2a4653d42a02bd Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Mon, 13 Nov 2023 20:22:23 +0100 Subject: [PATCH 20/25] make isort happy --- deformdemo/validation.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/deformdemo/validation.py b/deformdemo/validation.py index 83a3ee85..50080860 100644 --- a/deformdemo/validation.py +++ b/deformdemo/validation.py @@ -1,18 +1,20 @@ import gzip +import http.client +from io import BytesIO import sys import unittest +import urllib.parse from pyramid.paster import bootstrap -from io import BytesIO -import http.client -import urllib.parse - # Deform Demo from deformdemo import DeformDemo -UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, " \ - "like Gecko) Chrome/119.0.0.0 Safari/537.36" + +UA = ( + "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, " + "like Gecko) Chrome/119.0.0.0 Safari/537.36" +) def validate(data): @@ -91,6 +93,7 @@ def setUp(self): bs = bootstrap("demo.ini") app = bs["app"] self.request = bs["request"] + from webtest import TestApp self.testapp = TestApp(app) From 2a4d7e951bb3d76479da9dae3cb0797292798a52 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Tue, 14 Nov 2023 10:42:59 +0100 Subject: [PATCH 21/25] update python version in docs, setup.py; added me to contributors --- CONTRIBUTORS.txt | 1 + README.rst | 2 +- setup.py | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 01f89002..2efffe2c 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -112,3 +112,4 @@ Contributors - Steve Piercy 2020/05/11 - John Haiducek 2020/06/20 - Maksym Shalenyi 2020/06/20 +- Josip Delić 2023/11/14 diff --git a/README.rst b/README.rst index 0f6d28f9..3e978cd2 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Deform Demo Demonstration application for the `Deform `_ Python HTML form library. -This application is tested on Python versions 3.6, 3.7, 3.8, and 3.9, and PyPy3. +This application is tested on Python versions >= 3.8 <= 3.12, and PyPy3. Online version diff --git a/setup.py b/setup.py index 7a897aa5..6445cae8 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def readfile(name): requires = [ "Babel", "deform >= 2.0.15.dev0", # .dev0 allows pre-releases. - "pyramid >= 1.5a1", # route_name argument to resource_url + "pyramid >= 2.0a0", # route_name argument to resource_url "pyramid_chameleon", "pygments", "waitress", @@ -59,10 +59,11 @@ def readfile(name): "License :: Repoze Public License", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Internet :: WWW/HTTP", From a9be98a7cd86ef36a6d399d534aed868881236c9 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Tue, 14 Nov 2023 14:05:04 +0100 Subject: [PATCH 22/25] list specific python versions; update ci python setup --- .github/workflows/ci-tests.yml | 4 ++-- README.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d1db78d5..96a76422 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.py }} architecture: ${{ matrix.architecture }} @@ -58,7 +58,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.11 architecture: x64 diff --git a/README.rst b/README.rst index 3e978cd2..8a40d181 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Deform Demo Demonstration application for the `Deform `_ Python HTML form library. -This application is tested on Python versions >= 3.8 <= 3.12, and PyPy3. +This application is tested on Python versions 3.8, 3.9, 3.10, 3.11, and 3.12, and PyPy3. Online version From 5b0bb0f29cf5578c558d4750d0d1611d17d44bf0 Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Tue, 14 Nov 2023 21:02:11 +0100 Subject: [PATCH 23/25] fix multi select test --- deformdemo/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index 69efd948..abf719ed 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -3358,7 +3358,7 @@ def test_submit_complex_interaction(self): seq_height = findcss(".deform-seq-item").size["height"] persons = findxpaths( - '//div[@class="panel-heading"][contains(text(), "Person")]' + '//div[@class="card-header"][contains(text(), "Person")]' ) # Move item 3 up two From b1f64e869dbc0b5e005d6da00076f93059b61eec Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 15 Nov 2023 09:20:47 +0100 Subject: [PATCH 24/25] scroll into view --- deformdemo/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index abf719ed..d39cda8e 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -3372,7 +3372,7 @@ def test_submit_complex_interaction(self): persons[0], 0, seq_height * 1.5 ).perform() - findid("deformsubmit").click() + action_chains_on_id("deformsubmit").click() # sequences should be in reversed order inputs = findxpaths('//input[@name="name"]') From 2c441b695d2df53c1efe95f29c804787fb7a19bd Mon Sep 17 00:00:00 2001 From: Josip Delic Date: Wed, 15 Nov 2023 10:28:40 +0100 Subject: [PATCH 25/25] scroll into view add sleep and perform; add firefox local --- deformdemo/test.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/deformdemo/test.py b/deformdemo/test.py index d39cda8e..ab436b64 100644 --- a/deformdemo/test.py +++ b/deformdemo/test.py @@ -262,6 +262,12 @@ def setUpModule(): browser = Chrome() return browser + elif driver_name == "selenium_local_firefox": + from selenium.webdriver import Firefox + + browser = Firefox() + return browser + elif driver_name == "selenium_container_chrome": from selenium_containers import start_chrome @@ -3372,7 +3378,8 @@ def test_submit_complex_interaction(self): persons[0], 0, seq_height * 1.5 ).perform() - action_chains_on_id("deformsubmit").click() + action_chains_on_id("deformsubmit").click().perform() + time.sleep(0.2) # sequences should be in reversed order inputs = findxpaths('//input[@name="name"]')