Skip to content

Commit

Permalink
Fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
ale-rt committed May 16, 2018
1 parent 435d7ce commit 23150b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ New features:
Bug fixes:

- More Python 2 / 3 compatibility [ale-rt, pbauer]
- Start making code flake8 compliant [ale-rt]


2.0.11 (2018-01-30)
Expand Down
18 changes: 4 additions & 14 deletions plone/app/viewletmanager/tests/test_exportimport.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
from OFS.Folder import Folder
from persistent.dict import PersistentDict
from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage
from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage
from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter
from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage # noqa: E501
from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage # noqa: E501
from plone.app.viewletmanager.exportimport.storage import ViewletSettingsStorageNodeAdapter # noqa: E501
from plone.app.viewletmanager.interfaces import IViewletSettingsStorage
from plone.app.viewletmanager.storage import ViewletSettingsStorage
from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING
from plone.app.viewletmanager.testing import PLONE_APP_VIEWLETMANAGER_INTEGRATION_TESTING # noqa: E501
from Products.CMFPlone.exportimport.tests.base import BodyAdapterTestCase
from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup.tests.common import DummyExportContext
Expand All @@ -17,15 +16,6 @@
import unittest


# BBB Zope 2.12
try:
from Zope2.App import zcml
from OFS import metaconfigure
except ImportError:
from Products.Five import zcml
from Products.Five import fiveconfigure as metaconfigure


COMMON_SETUP_ORDER = {
'basic': {'top': ('one', )},
'fancy': {'top': ('two', 'three', 'one')},
Expand Down

0 comments on commit 23150b0

Please sign in to comment.