From 35d58c9046052961e677161780735dbcedb0febd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Deli=C4=87?= Date: Tue, 14 Nov 2023 14:23:57 +0100 Subject: [PATCH] [WIP] bootstrap5 + icons (#124) * bootstrap5 * update ci py version * update tox python version * update tox python version * use , sperator in tox passenv * use allowlist_externals * add './' in allowlist_externals * pin selenium version * fix select2 test * fix select2 test * fix select2 multiple test * fix select2 multiple test * fix select2 X test * fix selenium tests * fix linting && use new python, pypy version * fix flake8 * fix restructured text https://stackoverflow.com/a/39720161/1154966 does not work * fix unofficial-deformdemo (it never worked) * removed six; reactivated validation (do we still need it?) * make isort happy * update python version in docs, setup.py; added me to contributors * list specific python versions; update ci python setup --- .github/workflows/ci-tests.yml | 13 +- CONTRIBUTORS.txt | 1 + README.rst | 18 +-- deformdemo/__init__.py | 53 ++----- deformdemo/custom_widgets/modal.pt | 4 +- deformdemo/mini.py | 2 - deformdemo/scripts/html5check.py | 2 +- deformdemo/templates/form.pt | 24 ++-- deformdemo/templates/main.pt | 4 +- deformdemo/templates/popup_example.pt | 2 +- deformdemo/test.py | 132 +++++++++--------- deformdemo/validation.py | 29 ++-- setup.py | 18 +-- tox.ini | 13 +- unofficial-deformdemo/__init__.py | 50 +------ unofficial-deformdemo/templates/form.pt | 24 ++-- unofficial-deformdemo/templates/mini.pt | 66 --------- .../templates/popup_example.pt | 65 --------- 18 files changed, 157 insertions(+), 363 deletions(-) delete mode 100644 unofficial-deformdemo/templates/mini.pt delete mode 100644 unofficial-deformdemo/templates/popup_example.pt diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d3fb8c93..96a76422 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" + - "3.12" + - "pypy-3.10" os: - "ubuntu-latest" architecture: @@ -35,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 }} @@ -57,9 +58,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.11 architecture: x64 - run: | pip install tox 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 5ccab392..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.6, 3.7, 3.8, and 3.9, and PyPy3. +This application is tested on Python versions 3.8, 3.9, 3.10, 3.11, and 3.12, and PyPy3. Online version @@ -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 diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index 9dcca57a..cc46afa9 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -39,7 +39,12 @@ 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: @@ -69,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. @@ -95,7 +100,6 @@ def render_form( readonly=False, is_i18n=False, ): - captured = None if submitted in self.request.POST: @@ -126,7 +130,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) @@ -209,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() @@ -259,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" ) @@ -294,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): @@ -335,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( @@ -419,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): @@ -601,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"), @@ -625,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"), @@ -670,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"), @@ -693,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" ) @@ -715,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 ) @@ -787,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", @@ -812,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", @@ -826,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. # @@ -989,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 @@ -1012,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"), @@ -1685,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"), @@ -1707,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"), @@ -1729,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"), @@ -1751,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"), @@ -1774,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"), @@ -1800,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): @@ -1851,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): @@ -1901,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. @@ -1984,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"), @@ -2006,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"), @@ -2059,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): @@ -2078,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): @@ -2097,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"), @@ -2119,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"), @@ -2184,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): @@ -2213,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): @@ -2244,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"), @@ -2266,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"), @@ -2290,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"), @@ -2316,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"), @@ -2341,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) @@ -2585,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/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/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/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/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/deformdemo/test.py b/deformdemo/test.py index 5662655d..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) @@ -204,6 +200,9 @@ def wait_to_click(selector): # SO FUN! time.sleep(0.2) continue + if isinstance(e, ElementNotInteractableException): + time.sleep(0.2) + continue raise @@ -258,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 @@ -286,7 +283,6 @@ def setUpModule(): return browser elif driver_name == "selenium_container_opera": - from selenium_containers import start_opera from selenium.webdriver import DesiredCapabilities @@ -307,7 +303,6 @@ def setUpModule(): return browser elif driver_name == "selenium_container_firefox": - from selenium_containers import start_firefox from selenium.webdriver import DesiredCapabilities @@ -328,7 +323,6 @@ def setUpModule(): return browser elif driver_name == "selenium_local_firefox": - from selenium import webdriver try: @@ -2555,19 +2549,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("jala") + findcss(".select2-results li[aria-selected='false']").click() findid("deformsubmit").click() self.assertTrue( findid("captured").text in self.second_selected_captured @@ -2578,29 +2565,33 @@ 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( - 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.ENTER) 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( - Keys.ARROW_UP - ).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_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") + ] + ) + 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") @@ -2633,26 +2624,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 @@ -2663,25 +2653,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'}", ) @@ -2696,8 +2683,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 @@ -2705,11 +2693,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() @@ -2717,7 +2704,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): @@ -3595,8 +3582,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") @@ -3786,7 +3777,10 @@ 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): diff --git a/deformdemo/validation.py b/deformdemo/validation.py index 4c3c9a0e..50080860 100644 --- a/deformdemo/validation.py +++ b/deformdemo/validation.py @@ -1,25 +1,28 @@ import gzip -import json +import http.client +from io import BytesIO import sys import unittest +import urllib.parse from pyramid.paster import bootstrap -import StringIO -import httplib -from six.moves import input -import urlparse - # 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 +44,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 +59,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 +70,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 +82,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): @@ -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) @@ -109,7 +112,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 77a67404..6445cae8 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 @@ -26,15 +24,12 @@ 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. - "pyramid >= 1.5a1", # route_name argument to resource_url + "pyramid >= 2.0a0", # route_name argument to resource_url "pyramid_chameleon", "pygments", - "six", "waitress", ] @@ -50,11 +45,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", @@ -68,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", diff --git a/tox.ini b/tox.ini index 1de24f1b..c3cfab79 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,17 @@ [tox] envlist = lint, - py36, - py37, py38, py39, + py310, + py311, + py312, pypy3 [testenv] usedevelop = true -passenv = DISPLAY WEBDRIVER URL WAITTOSTART CONTAINERTZ -whitelist_externals = tox.sh +passenv = DISPLAY, WEBDRIVER, URL, WAITTOSTART, CONTAINERTZ +allowlist_externals = ./tox.sh commands = pip install -Ur requirements-dev.txt pip freeze @@ -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 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 dbf64e3e..00000000 --- a/unofficial-deformdemo/templates/popup_example.pt +++ /dev/null @@ -1,65 +0,0 @@ - -
- -
- -
- -
- - -
- -
- -
-
-

Demo: ${title}

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

Captured submission

-
-
- 
-
-
- -
-
-

Code - (click to show in context) -

-
-
- 
-
-
-
-
-