EasyWidgets 0.4__tar.gz → 0.4.2__tar.gz

{EasyWidgets-0.4 → easywidgets-0.4.2}/EasyWidgets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: EasyWidgets
-Version: 0.4
+Version: 0.4.2
 Summary: A minimalistic approach to HTML generation and validation with TurboGears
 Home-page: https://sourceforge.net/p/easywidgets/code/
 Author: Rick Copeland
@@ -8,9 +8,7 @@ Author-email: rick446@usa.net
 License: MIT
 Project-URL: Documentation, http://easywidgets.pythonisito.com
 Project-URL: Source Code, https://sourceforge.net/p/easywidgets/code/
-Description: Not so easy.
 Keywords: TurboGears FormEncode TurboGears2
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Web Environment
 Classifier: Framework :: TurboGears
@@ -20,5 +18,17 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
+Requires-Dist: python-dateutil
+Requires-Dist: formencode
+Requires-Dist: markupsafe
+Requires-Dist: paste
+Requires-Dist: webob
+Requires-Dist: six>=1.13.0
+
+Not so easy.

easywidgets-0.4.2/EasyWidgets.egg-info/entry_points.txt

@@ -0,0 +1,7 @@
+[easy_widgets.engines]
+core-ew = ew.render:CoreEngine
+jinja2 = ew.render:Jinja2Engine
+json = ew.render:JsonEngine
+
+[paste.filter_factory]
+easy_widgets = ew.middleware:paste_filter_factory

{EasyWidgets-0.4 → easywidgets-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.1
 Name: EasyWidgets
-Version: 0.4
+Version: 0.4.2
 Summary: A minimalistic approach to HTML generation and validation with TurboGears
 Home-page: https://sourceforge.net/p/easywidgets/code/
 Author: Rick Copeland
@@ -8,9 +8,7 @@ Author-email: rick446@usa.net
 License: MIT
 Project-URL: Documentation, http://easywidgets.pythonisito.com
 Project-URL: Source Code, https://sourceforge.net/p/easywidgets/code/
-Description: Not so easy.
 Keywords: TurboGears FormEncode TurboGears2
-Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Web Environment
 Classifier: Framework :: TurboGears
@@ -20,5 +18,17 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.8
+Requires-Dist: python-dateutil
+Requires-Dist: formencode
+Requires-Dist: markupsafe
+Requires-Dist: paste
+Requires-Dist: webob
+Requires-Dist: six>=1.13.0
+
+Not so easy.

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/fields.py

@@ -50,8 +50,8 @@ class FieldWidget(Widget, fev.Validator):
         if 'value' in context:
             try:
                 context['value'] = self.from_python(context['value'], None)
-            except Exception as e:
-                warnings.warn('suppressed an error that you should probably fix. ' + traceback.format_exc(e),
+            except Exception:
+                warnings.warn('suppressed an error that you should probably fix. ' + traceback.format_exc(),
                               EasyWidgetsWarning,
                               stacklevel=4,
                               )

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/middleware.py

@@ -1,8 +1,9 @@
-import cgi
+import urllib
 import logging
 
 from webob import exc
 from paste import fileapp
+from urllib.parse import urlparse
 
 from .core import widget_context, WidgetContext
 from .resource import ResourceManager
@@ -68,11 +69,11 @@ class WidgetMiddleware:
             result = self.app(environ, start_response)
         elif environ['PATH_INFO'].startswith(self.script_name_slim_js):
             result = self.serve_slim_js(
-                mgr, cgi.parse_qs(environ['QUERY_STRING']).get('href', [''])[0],
+                mgr, urllib.parse.parse_qs(environ['QUERY_STRING']).get('href', [''])[0],
                 environ, start_response)
         elif environ['PATH_INFO'].startswith(self.script_name_slim_css):
             result = self.serve_slim_css(
-                mgr, cgi.parse_qs(environ['QUERY_STRING']).get('href', [''])[0],
+                mgr, urllib.parse.parse_qs(environ['QUERY_STRING']).get('href', [''])[0],
                 environ, start_response)
         else:
             result = self.serve_resource(mgr, environ['PATH_INFO'][len(self.script_name):], environ, start_response)

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/resource.py

@@ -140,6 +140,8 @@ class ResourceManager:
             pass
         def get_plain(h):
             fn = self.get_filename(h)
+            if not fn:
+                return ''
             return open(fn, encoding='utf-8').read()
         def get_min_js(h):
             if '.min.' in h:
@@ -179,7 +181,7 @@ class ResourceManager:
             except ImportError: # pragma no cover
                 pass
         joiner = ';\n' if file_type == 'js' else '\n'
-        content = joiner.join(getter(h) for h in href.split(';') )
+        content = joiner.join(getter(h) for h in href.split(';') if h)
         if self.use_cache:
             self.resource_cache[href] = content
         return content

easywidgets-0.4.2/ew/tests/helpers.py

@@ -0,0 +1,15 @@
+from paste.registry import Registry
+from ew import widget_context, TemplateEngine
+from ew.core import WidgetContext
+from ew.resource import ResourceManager
+
+REGISTRY = Registry()
+REGISTRY.prepare()
+
+
+def setup_method():
+    TemplateEngine.initialize({})
+    mgr = ResourceManager()
+    REGISTRY.register(
+        widget_context,
+        WidgetContext(scheme='http', resource_manager=mgr))

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/tests/test_fields.py

@@ -3,18 +3,24 @@ from datetime import date, time
 import formencode as fe
 from formencode import validators as fev
 from bs4 import BeautifulSoup
+from ew.tests.helpers import setup_method
 
 import ew
 import ew.jinja2_ew
-from ew.tests.helpers import TestCase
+import pytest
+
 
 def soup(text):
-    soup = BeautifulSoup(text)
+    soup = BeautifulSoup(text, "html.parser")
     for n in soup.findAll():
         n.attrs = sorted(n.attrs)
     return soup
 
-class _TestFields(TestCase):
+
+class TestFields:
+
+    def setup_method(self):
+        setup_method()
 
     def test_text_field(self):
         w = self.ew.InputField(id="w", name='foo')
@@ -34,7 +40,8 @@ class _TestFields(TestCase):
         w = self.ew.InputField(
             name='foo',
             validator=fev.UnicodeString(min=2))
-        self.assertRaises(fe.Invalid, w.to_python, 'x', None)
+        with pytest.raises(fe.Invalid):
+            w.to_python('x', None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
 
     def test_html_field(self):
@@ -48,10 +55,72 @@ class _TestFields(TestCase):
         text = fld.display(value=5)
         assert soup('<a href="/foo/5/">Bar</a>') == soup(text), text
 
-class _TestFieldSet(TestCase):
+    ew = ew.jinja2_ew
+
+
+    def test_link_field(self):
+        text = self.ew.LinkField().display(value='/foo/5/')
+        assert '<a href="/foo/5/">/foo/5/</a>' == text
+
+        expected = '<a href="/foo">bar</a>'
+        assert expected == self.ew.LinkField(href='/foo').display(value='bar')
+        assert expected == self.ew.LinkField(text='bar').display(value='/foo')
+        assert expected == self.ew.LinkField().display(value=dict(href='/foo', text='bar'))
+        assert expected == self.ew.LinkField(label='bar').display(value=dict(href='/foo'))
+        assert expected == self.ew.LinkField(href='/foo').display(value=dict(text='bar'))
+        assert expected == self.ew.LinkField(attrs={'href':'/foo'}).display(value='bar')
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(value=dict(href='/foo', text='bar'))
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(href='/foo', value='bar')
+
+    def test_link_plaintext(self):
+        expected = 'bar'
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(value=dict(text='bar'))
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, label='bar').display(value=dict())
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, label='foo').display(value='bar')
+
+    def test_link_escaping(self):
+        text = '<script>alert("foo")</script>'
+        href = '" onclick="alert(\'foo\')'
+        expected = '<a >&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;</a>'
+        assert expected == self.ew.LinkField().display(text=text)
+        assert expected == self.ew.LinkField().display(text=text, value={})
+        assert expected == self.ew.LinkField().display(label=text)
+        assert expected == self.ew.LinkField().display(label=text, value={})
+        assert expected == self.ew.LinkField().display(value={'text':text})
+        assert expected == self.ew.LinkField(text=text).display()
+        assert expected == self.ew.LinkField(text=text).display(value={})
+        assert expected == self.ew.LinkField(label=text).display()
+        assert expected == self.ew.LinkField(label=text).display(value={})
+        assert expected == self.ew.LinkField(value={'text':text}).display()
+        expected = '<a href="&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;">&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;</a>'
+        assert expected == self.ew.LinkField().display(value=text)
+        assert expected == self.ew.LinkField(value=text).display()
+        expected = '<a href="&#34; onclick=&#34;alert(&#39;foo&#39;)">None</a>'
+        assert expected == self.ew.LinkField().display(href=href)
+        assert expected == self.ew.LinkField().display(href=href, value={})
+        assert expected == self.ew.LinkField().display(attrs={'href':href})
+        assert expected == self.ew.LinkField().display(attrs={'href':href}, value={})
+        assert expected == self.ew.LinkField().display(value={'href':href})
+        assert expected == self.ew.LinkField(href=href).display()
+        assert expected == self.ew.LinkField(href=href).display(value={})
+        assert expected == self.ew.LinkField(attrs={'href':href}).display()
+        assert expected == self.ew.LinkField(attrs={'href':href}).display(value={})
+        assert expected == self.ew.LinkField(value={'href':href}).display()
+        expected = '&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;'
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(text=text)
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(label=text)
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(value=text)
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True).display(value={'text':text})
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, label=text).display()
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, text=text).display()
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, value=text).display()
+        assert expected == self.ew.LinkField(plaintext_if_no_href=True, value={'text':text}).display()
 
-    def setUp(self):
-        super().setUp()
+
+class TestFieldSet:
+
+    def setup_method(self):
+        setup_method()
         self.w = self.ew.FieldSet(
             id="w",
             fields=[
@@ -87,7 +156,8 @@ class _TestFieldSet(TestCase):
         assert '<input id="w.bar" name="bar" value="baz"' in text
 
     def test_validation(self):
-        self.assertRaises(fe.Invalid, self.w.to_python, dict(foo='x', bar='xxy'), None)
+        with pytest.raises(fe.Invalid):
+            self.w.to_python(dict(foo='x', bar='xxy'), None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.w.display()
         assert '<label for="w.foo"' in text, text
@@ -104,18 +174,21 @@ class _TestFieldSet(TestCase):
         assert '<input id="w.fs.foo" name="fs.foo" value="bar"' in text
 
     def test_nested_validation(self):
-        self.assertRaises(fe.Invalid, self.nested_w.to_python,
-                          dict(fs=dict(foo='x')), None)
+        with pytest.raises(fe.Invalid):
+            self.nested_w.to_python(dict(fs=dict(foo='x')), None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.nested_w.display()
         assert '<label for="w.fs.foo"' in text
         assert '<span class="fielderror"' in text
         assert '<input id="w.fs.foo" name="fs.foo" value="x"' in text
 
-class _TestRowField(TestCase):
+    ew = ew.jinja2_ew
+
 
-    def setUp(self):
-        super().setUp()
+class TestRowField:
+
+    def setup_method(self):
+        setup_method()
         self.w = self.ew.RowField(
             id="w-row",
             fields=[
@@ -134,16 +207,20 @@ class _TestRowField(TestCase):
         assert '<input id="w-row.a" name="a" value="bar"' in text
 
     def test_validation(self):
-        self.assertRaises(fe.Invalid, self.w.to_python, dict(a='x', b='xx'), None)
+        with pytest.raises(fe.Invalid):
+            self.w.to_python(dict(a='x', b='xx'), None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.w.display()
         assert '<span class="fielderror"' in text
         assert '<input id="w-row.a" name="a" value="x"' in text, text
 
-class _TestRepeatedField(TestCase):
+    ew = ew.jinja2_ew
+
+
+class TestRepeatedField:
 
-    def setUp(self):
-        super().setUp()
+    def setup_method(self):
+        setup_method()
         self.w = self.ew.RepeatedField(
             id='w-a',
             field=self.ew.InputField(
@@ -160,17 +237,20 @@ class _TestRepeatedField(TestCase):
         assert '<input id="w-a-1" name="a-1"' not in text
 
     def test_validation(self):
-        self.assertRaises(fe.Invalid, self.w.to_python, ['x', 'xx'], None)
+        with pytest.raises(fe.Invalid):
+            self.w.to_python(['x', 'xx'], None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.w.display(value=['xxx', 'xxx'])
         assert '<span class="fielderror"' in text
         assert '<input id="w-a-0" name="a-0" value="x"' in text, text
 
+    ew = ew.jinja2_ew
 
-class _TestTableField(TestCase):
 
-    def setUp(self):
-        super().setUp()
+class TestTableField:
+
+    def setup_method(self):
+        setup_method()
         self.w = self.ew.TableField(
             id="w-foo",
             name='foo',
@@ -190,17 +270,19 @@ class _TestTableField(TestCase):
         assert '<input id="w-foo-row-0.a" name="foo-0.a" value="xx">' in text, text
 
     def test_validation(self):
-        self.assertRaises(
-            fe.Invalid, self.w.to_python,
-            [ dict(a='x', b='xx'),
-              dict(a='yy', b='yy')],
-            None)
+        with pytest.raises(fe.Invalid):
+            self.w.to_python([dict(a='x', b='xx'),
+                              dict(a='yy', b='yy')],
+                             None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.w.display()
         assert '<span class="fielderror"' in text, text
         assert '<input id="w-foo-row-0.a" name="foo-0.a" value="x">' in text, text
 
-class _TestInputFields(TestCase):
+    ew = ew.jinja2_ew
+
+
+class TestInputFields:
 
     def test_text_field(self):
         t = self.ew.TextField(id="w-foo", name='foo')
@@ -209,34 +291,43 @@ class _TestInputFields(TestCase):
     def test_email_field(self):
         t = self.ew.EmailField(id="w-foo", name='foo')
         assert t.display() == '<input id="w-foo" name="foo" type="text">'
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf', None)
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf@bar', None)
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf@bar@bar.com', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf@bar', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf@bar@bar.com', None)
         t.to_python('foo@bar.com', None)
 
     def test_int_field(self):
         t = self.ew.IntField(id="w-foo", name='foo')
         assert t.display() == '<input id="w-foo" name="foo" type="text">'
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf', None)
-        self.assertRaises(fe.Invalid, t.to_python, '42.5', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('42.5', None)
         assert 42 == t.to_python('42', None)
 
     def test_date_field(self):
         t = self.ew.DateField(id="w-foo", name='foo')
         text = t.display()
         assert soup(text) == soup('<input id="w-foo" name="foo" type="text" style="width:6em">'), text
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf', None)
-        self.assertRaises(fe.Invalid, t.to_python, '1990.01.32', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('1990.01.32', None)
         assert date(1990, 1, 1) == t.to_python('01/01/1990', None)
 
     def test_time_field(self):
         t = self.ew.TimeField(id="w-foo", name='foo')
         text = t.display()
         assert soup(text) == soup('<input id="w-foo" name="foo" style="width:5em" type="text">'), soup(text)
-        self.assertRaises(fe.Invalid, t.to_python, 'asdf', None)
-        self.assertRaises(fe.Invalid, t.to_python, '01:67', None)
-        assert time(1,34) == t.to_python('1:34', None)
-        assert time(13,34) == t.to_python('1:34 pm', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('asdf', None)
+        with pytest.raises(fe.Invalid):
+            t.to_python('01:67', None)
+        assert time(1, 34) == t.to_python('1:34', None)
+        assert time(13, 34) == t.to_python('1:34 pm', None)
 
     def test_textarea(self):
         t = self.ew.TextArea(id="w-foo", name='foo', value="<script/>")
@@ -263,7 +354,10 @@ class _TestInputFields(TestCase):
         assert (soup(text)==soup('<input name="foo" '
                 'value="Bar" type="submit" class="submit">')), text
 
-class _TestSelectFields(TestCase):
+    ew = ew.jinja2_ew
+
+
+class TestSelectFields:
 
     def test_single_select(self):
         for optlist in [
@@ -290,7 +384,6 @@ class _TestSelectFields(TestCase):
         assert '<option value="b">' in text, text
         assert '&lt;script&gt;alert(1)&lt;/script&gt;' in text, text
 
-
     def test_multi_select(self):
         for optlist in [
             'abc',
@@ -330,10 +423,13 @@ class _TestSelectFields(TestCase):
             assert '<input checked name="foo" type="checkbox" value="b">' in text, text
             assert '<input checked name="foo" type="checkbox" value="c">' in text, text
 
-class _TestForms(TestCase):
+    ew = ew.jinja2_ew
+
 
-    def setUp(self):
-        super().setUp()
+class TestForms:
+
+    def setup_method(self):
+        setup_method()
         self.w = self.ew.SimpleForm(
             id="w-foo",
             fields=[
@@ -356,7 +452,8 @@ class _TestForms(TestCase):
         assert '<input id="w-foo.bar" name="bar" value="baz"' in text
 
     def test_validation(self):
-        self.assertRaises(fe.Invalid, self.w.to_python, dict(foo='x', bar='xxy'), None)
+        with pytest.raises(fe.Invalid):
+            self.w.to_python(dict(foo='x', bar='xxy'), None)
         assert isinstance(ew.widget_context.validation_error, fe.Invalid)
         text = self.w.display()
         assert '<label for="w-foo.foo"' in text, text
@@ -364,71 +461,4 @@ class _TestForms(TestCase):
         assert '<input id="w-foo.foo" name="foo" value="x"' in text
         assert '<input id="w-foo.bar" name="bar" value="xxy"' in text
 
-class TestFieldSetJinja2(_TestFieldSet): ew=ew.jinja2_ew
-class TestRowFieldJinja2(_TestRowField): ew=ew.jinja2_ew
-class TestRepeatedFieldJinja2(_TestRepeatedField): ew=ew.jinja2_ew
-class TestTableFieldJinja2(_TestTableField): ew=ew.jinja2_ew
-class TestInputFieldsJinja2(_TestInputFields): ew=ew.jinja2_ew
-class TestSelectFieldsJinja2(_TestSelectFields): ew=ew.jinja2_ew
-class TestFormsJinja2(_TestForms): ew=ew.jinja2_ew
-
-class TestFieldsJinja2(_TestFields):
-    ew=ew.jinja2_ew
-
-    def test_link_field(self):
-        text = self.ew.LinkField().display(value='/foo/5/')
-        self.assertEqual('<a href="/foo/5/">/foo/5/</a>', text)
-
-        expected = '<a href="/foo">bar</a>'
-        self.assertEqual(expected, self.ew.LinkField(href='/foo').display(value='bar'))
-        self.assertEqual(expected, self.ew.LinkField(text='bar').display(value='/foo'))
-        self.assertEqual(expected, self.ew.LinkField().display(value=dict(href='/foo', text='bar')))
-        self.assertEqual(expected, self.ew.LinkField(label='bar').display(value=dict(href='/foo')))
-        self.assertEqual(expected, self.ew.LinkField(href='/foo').display(value=dict(text='bar')))
-        self.assertEqual(expected, self.ew.LinkField(attrs={'href':'/foo'}).display(value='bar'))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(value=dict(href='/foo', text='bar')))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(href='/foo', value='bar'))
-
-    def test_link_plaintext(self):
-        expected = 'bar'
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(value=dict(text='bar')))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, label='bar').display(value=dict()))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, label='foo').display(value='bar'))
-
-    def test_link_escaping(self):
-        text = '<script>alert("foo")</script>'
-        href = '" onclick="alert(\'foo\')'
-        expected = '<a >&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;</a>'
-        self.assertEqual(expected, self.ew.LinkField().display(text=text))
-        self.assertEqual(expected, self.ew.LinkField().display(text=text, value={}))
-        self.assertEqual(expected, self.ew.LinkField().display(label=text))
-        self.assertEqual(expected, self.ew.LinkField().display(label=text, value={}))
-        self.assertEqual(expected, self.ew.LinkField().display(value={'text':text}))
-        self.assertEqual(expected, self.ew.LinkField(text=text).display())
-        self.assertEqual(expected, self.ew.LinkField(text=text).display(value={}))
-        self.assertEqual(expected, self.ew.LinkField(label=text).display())
-        self.assertEqual(expected, self.ew.LinkField(label=text).display(value={}))
-        self.assertEqual(expected, self.ew.LinkField(value={'text':text}).display())
-        expected = '<a href="&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;">&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;</a>'
-        self.assertEqual(expected, self.ew.LinkField().display(value=text))
-        self.assertEqual(expected, self.ew.LinkField(value=text).display())
-        expected = '<a href="&#34; onclick=&#34;alert(&#39;foo&#39;)">None</a>'
-        self.assertEqual(expected, self.ew.LinkField().display(href=href))
-        self.assertEqual(expected, self.ew.LinkField().display(href=href, value={}))
-        self.assertEqual(expected, self.ew.LinkField().display(attrs={'href':href}))
-        self.assertEqual(expected, self.ew.LinkField().display(attrs={'href':href}, value={}))
-        self.assertEqual(expected, self.ew.LinkField().display(value={'href':href}))
-        self.assertEqual(expected, self.ew.LinkField(href=href).display())
-        self.assertEqual(expected, self.ew.LinkField(href=href).display(value={}))
-        self.assertEqual(expected, self.ew.LinkField(attrs={'href':href}).display())
-        self.assertEqual(expected, self.ew.LinkField(attrs={'href':href}).display(value={}))
-        self.assertEqual(expected, self.ew.LinkField(value={'href':href}).display())
-        expected = '&lt;script&gt;alert(&#34;foo&#34;)&lt;/script&gt;'
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(text=text))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(label=text))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(value=text))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True).display(value={'text':text}))
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, label=text).display())
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, text=text).display())
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, value=text).display())
-        self.assertEqual(expected, self.ew.LinkField(plaintext_if_no_href=True, value={'text':text}).display())
+    ew = ew.jinja2_ew

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/tests/test_resource.py

@@ -6,9 +6,10 @@ from webtest import TestApp
 
 from ew import widget_context, Snippet, WidgetMiddleware, Widget
 from ew import ResourceManager
-from ew.tests.helpers import TestCase, REGISTRY
+from ew.tests.helpers import REGISTRY
 
 import ew.jinja2_ew
+import pytest
 
 TEMPLATE = Snippet('''<html>
 <head>
@@ -24,9 +25,9 @@ TEMPLATE = Snippet('''<html>
 </html>''', 'jinja2')
 
 
-class _TestResourceInclusion(TestCase):
+class TestResourceInclusion:
 
-    def setUp(self):
+    def setup_method(self):
         self.w = Widget(
             template=Snippet('<h1>My Widget</h1>'),
             resources=lambda:[
@@ -37,6 +38,7 @@ class _TestResourceInclusion(TestCase):
                 self.ew.JSScript('/* body_tail */', 'body_js_tail')
                 ])
         self.app = TestApp(_WidgetTest(self.w))
+    ew = ew.jinja2_ew
 
     def test_render(self):
         res = self.app.get('/')
@@ -60,9 +62,10 @@ class _TestResourceInclusion(TestCase):
         for part in parts:
             assert part in res, f'{part} not in {res}'
 
-class _TestScripts(TestCase):
 
-    def setUp(self):
+class TestScripts:
+
+    def setup_method(self):
         self.resources = [
                 self.ew.JSLink('a/foo.js'),
                 self.ew.JSLink('a/bar.js'),
@@ -75,6 +78,8 @@ class _TestScripts(TestCase):
         self.wtest = _WidgetTest(self.w)
         self.app = TestApp(self.wtest)
 
+    ew = ew.jinja2_ew
+
     def test_render(self):
         app = TestApp(_WidgetTest(self.w))
         res = app.get('/')
@@ -126,10 +131,14 @@ class _TestScripts(TestCase):
         res = app.get('/_ew_resources/_slim/js?href=a%2Ftest-utf8.js')
         assert 'ƒ∂ß' in res.text
 
+        app.get('/_ew_resources/_slim/js')  # no param
+        app.get('/_ew_resources/_slim/js?href=foo;bar;;baz')  # bad params
+
     def test_reregister(self):
         ResourceManager.register_directory('a', 'foo')
         ResourceManager.register_directory('a', 'foo')
-        self.assertRaises(AssertionError, ResourceManager.register_directory, 'a', 'bar')
+        with pytest.raises(AssertionError):
+            ResourceManager.register_directory('a', 'bar')
 
     def test_incompressible(self):
         self.resources.append(self.ew.JSLink('a/baz.js', compress=False))
@@ -139,8 +148,6 @@ class _TestScripts(TestCase):
                 'a%2Ffoo.js%3Ba%2Fbar.js"') in res, res
         assert 'src="/_ew_resources/a/baz.js"' in res, res
 
-class TestResourceInclusionJinja2(_TestResourceInclusion): ew=ew.jinja2_ew
-class TestScriptsJinja2(_TestScripts): ew=ew.jinja2_ew
 
 class _WidgetTest:
 
@@ -162,14 +169,12 @@ class _WidgetTest:
                 resource_manager=widget_context.resource_manager))
         return res(environ, start_response)
 
-class TestResourceSecurity(TestCase):
+class TestResourceSecurity:
 
-    def setUp(self):
+    def setup_method(self):
         self.rm = ResourceManager()
         self.rm.register_directory('res-test', '/a/b/c')
 
     def test_cant_break_out(self):
-        self.assertEqual(
-            self.rm.get_filename('res-test/../etc/passwd'),
-            None)
+        assert self.rm.get_filename('res-test/../etc/passwd') ==    None
 

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/tests/test_utils.py

@@ -1,9 +1,10 @@
-from unittest import TestCase
+import pytest
 
 from ew import utils
 from ew import widget
 
-class TestBunch(TestCase):
+
+class TestBunch:
 
     def test_like_dict(self):
         b = utils.Bunch(
@@ -19,14 +20,16 @@ class TestBunch(TestCase):
     def test_invalid_getattr(self):
         b = utils.Bunch(
             foo=0, bar=1)
-        self.assertRaises(AttributeError, getattr, b, 'baz')
+        with pytest.raises(AttributeError):
+            getattr(b, 'baz')
 
     def test_invalid_getitem(self):
         b = utils.Bunch(
             foo=0, bar=1)
-        self.assertRaises(KeyError, b.__getitem__, 'baz')
+        pytest.raises(KeyError, b.__getitem__, 'baz')
+
 
-class TestPushContext(TestCase):
+class TestPushContext:
 
     def test_push_context(self):
         x = utils.Bunch(foo=1, bar=2)
@@ -35,11 +38,12 @@ class TestPushContext(TestCase):
             assert x.bar == 2
             assert x.baz == 0
         assert x.foo == 1
-        self.assertRaises(KeyError, x.__getitem__, 'baz')
+        pytest.raises(KeyError, x.__getitem__, 'baz')
 
-class TestNameListAsClass(TestCase):
 
-    def setUp(self):
+class TestNameListAsClass:
+
+    def setup_method(self):
         class widgets(utils.NameList):
             a=widget.Widget()
             b=widget.Widget(name='boo')
@@ -48,16 +52,18 @@ class TestNameListAsClass(TestCase):
     def test_widget_names(self):
         assert self.widgets.a.name == 'a'
         assert self.widgets.b.name == 'boo'
-        self.assertRaises(AttributeError, getattr, self.widgets, 'c')
+        with pytest.raises(AttributeError):
+            getattr(self.widgets, 'c')
 
     def test_widgets_by_index(self):
         assert self.widgets[0] == self.widgets.a
         assert self.widgets[1] == self.widgets.b
         assert self.widgets == [ self.widgets.a, self.widgets.b ]
 
-class TestWidgetListAsList(TestCase):
 
-    def setUp(self):
+class TestWidgetListAsList:
+
+    def setup_method(self):
         self.a = widget.Widget(name='a')
         self.b = widget.Widget(name='b')
         self.c = widget.Widget(name='c')

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/tests/test_widget.py

@@ -1,10 +1,10 @@
 import json
 
-from ew.tests.helpers import TestCase
-from ew import widget, errors, Snippet, File
+from ew import widget, Snippet
 
 
-class TestWidget(TestCase):
+
+class TestWidget:
 
     def test_json(self):
         w = widget.Widget(

{EasyWidgets-0.4 → easywidgets-0.4.2}/ew/validators.py

@@ -9,9 +9,9 @@ class Currency(fev.Number):
     format='$%.2f'
     store_factor=100
 
-    def _to_python(self, value, state):
+    def to_python(self, value, state):
         value = value.strip(' \r\n\t' + self.symbol)
-        return int(fev.Number._to_python(self, value, state) * self.store_factor)
+        return int(fev.Number.to_python(self, value, state) * self.store_factor)
 
     def from_python(self, value, state):
         if isinstance(value, str):
@@ -22,8 +22,8 @@ class Currency(fev.Number):
 
 class TimeConverter(fev.TimeConverter):
 
-    def _to_python(self, value, state):
-        value = super()._to_python(value, state)
+    def to_python(self, value, state):
+        value = super().to_python(value, state)
         if value is not None:
             value = time(*value)
         return value
@@ -47,7 +47,7 @@ class OneOf(fev.FancyValidator):
     def __init__(self, options):
         self.options = options
 
-    def validate_python(self, value, state):
+    def _validate_python(self, value, state):
         if callable(self.options):
             options = self.options()
         else:

{EasyWidgets-0.4 → easywidgets-0.4.2}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.4'
+version = '0.4.2'
 
 setup(name='EasyWidgets',
       version=version,
@@ -16,7 +16,12 @@ setup(name='EasyWidgets',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        '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',
+
         ],
       keywords='TurboGears FormEncode TurboGears2',
       author='Rick Copeland',
@@ -34,7 +39,7 @@ setup(name='EasyWidgets',
             'public/*/*']},
       include_package_data=True,
       zip_safe=False,
-      python_requires='>=3.7',
+      python_requires='>=3.8',
       install_requires=[
           # -*- Extra requirements: -*-
         'python-dateutil',
@@ -45,7 +50,7 @@ setup(name='EasyWidgets',
         'six>=1.13.0',
       ],
       tests_require=[
-          'nose',
+          'pytest',
           'webtest',
           'bs4',
           'jinja2',

EasyWidgets-0.4/EasyWidgets.egg-info/entry_points.txt

@@ -1,11 +0,0 @@
-
-      # -*- Entry points: -*-
-      [easy_widgets.engines]
-      json = ew.render:JsonEngine
-      core-ew = ew.render:CoreEngine
-      jinja2 = ew.render:Jinja2Engine
-
-      [paste.filter_factory]
-      easy_widgets = ew.middleware:paste_filter_factory
-
-      

EasyWidgets-0.4/ew/tests/helpers.py

@@ -1,18 +0,0 @@
-import unittest
-
-from paste.registry import Registry
-from ew import widget_context, TemplateEngine
-from ew.core import WidgetContext
-from ew.resource import ResourceManager
-
-REGISTRY = Registry()
-REGISTRY.prepare()
-
-class TestCase(unittest.TestCase):
-
-    def setUp(self):
-        TemplateEngine.initialize({})
-        mgr = ResourceManager()
-        REGISTRY.register(
-            widget_context,
-            WidgetContext(scheme='http', resource_manager=mgr))