diff --git a/news/58.bugfix b/news/58.bugfix new file mode 100644 index 0000000..2fec334 --- /dev/null +++ b/news/58.bugfix @@ -0,0 +1 @@ +Fix deprecation warnings diff --git a/plone/formwidget/namedfile/tests.py b/plone/formwidget/namedfile/tests.py index d018079..da6cf95 100644 --- a/plone/formwidget/namedfile/tests.py +++ b/plone/formwidget/namedfile/tests.py @@ -39,7 +39,6 @@ def Title(self): class ScaleGenerateOnSaveTests(unittest.TestCase): - layer = FUNCTIONAL_TESTING def setUp(self): @@ -72,7 +71,9 @@ def test_generate_scales_on_save(self): def test_suite(): suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(ScaleGenerateOnSaveTests)) + suite.addTest( + unittest.defaultTestLoader.loadTestsFromTestCase(ScaleGenerateOnSaveTests) + ) suite.addTest( layered( doctest.DocFileSuite( diff --git a/plone/formwidget/namedfile/utils.py b/plone/formwidget/namedfile/utils.py index f3a3643..3478f88 100644 --- a/plone/formwidget/namedfile/utils.py +++ b/plone/formwidget/namedfile/utils.py @@ -1,17 +1,17 @@ from BTrees.OOBTree import OOBTree -from Products.CMFPlone.interfaces import IImagingSchema -from ZPublisher.HTTPRequest import FileUpload from datetime import datetime from datetime import timedelta from persistent.dict import PersistentDict +from plone.base.interfaces import IImagingSchema from plone.formwidget.namedfile.interfaces import IFileUploadTemporaryStorage from plone.registry.interfaces import IRegistry from random import randint from zope.annotation.interfaces import IAnnotations from zope.component import adapter from zope.component import getUtility -from zope.interface import Interface from zope.interface import implementer +from zope.interface import Interface +from ZPublisher.HTTPRequest import FileUpload FILE_UPLOAD_MAP_KEY = "file_upload_map" diff --git a/setup.py b/setup.py index 1117533..b8f3519 100644 --- a/setup.py +++ b/setup.py @@ -32,6 +32,7 @@ zip_safe=False, install_requires=[ "setuptools", + "plone.base", "plone.namedfile", "plone.z3cform >= 0.7.4", "z3c.form",