Skip to content

Commit

Permalink
Merge pull request #60 from plone/python3
Browse files Browse the repository at this point in the history
fix relative imports for py3
  • Loading branch information
jensens committed Apr 11, 2018
2 parents 6384004 + 38f7f0c commit 8e993ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ New features:

Bug fixes:

- *add item here*
- Python 3 compatibility.
[pbauer]


3.3.7 (2018-02-05)
Expand Down
2 changes: 1 addition & 1 deletion plone/app/iterate/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
$Id: lock.py 1392 2006-06-20 01:02:17Z hazmat $
"""

from interfaces import ITERATE_LOCK
from .interfaces import ITERATE_LOCK
from plone.locking.interfaces import ILockable


Expand Down
6 changes: 3 additions & 3 deletions plone/app/iterate/relation.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
Archetypes speicifc implementation for relation handling
"""

from interfaces import ICheckinCheckoutReference
from interfaces import IIterateAware
from interfaces import IWorkingCopyRelation
from .interfaces import ICheckinCheckoutReference
from .interfaces import IIterateAware
from .interfaces import IWorkingCopyRelation
from Products.Archetypes import config as atconf
from Products.Archetypes.exceptions import ReferenceException
from Products.Archetypes.ReferenceEngine import Reference
Expand Down
2 changes: 1 addition & 1 deletion plone/app/iterate/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##################################################################

from interfaces import annotation_key
from .interfaces import annotation_key
from persistent.dict import PersistentDict
from Products.CMFPlone.utils import get_installer
from zope.annotation import IAnnotations
Expand Down

1 comment on commit 8e993ae

@jenkins-plone-org
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jensens Jenkins CI reporting about code analysis
See the full report here: https://jenkins.plone.org/job/package-plone.app.iterate/60/violations

plone/app/iterate/setuphandlers.py:11:27: C812 missing trailing comma
plone/app/iterate/interfaces.py:321:23: C812 missing trailing comma
plone/app/iterate/interfaces.py:328:22: C812 missing trailing comma
plone/app/iterate/base.py:160:22: W292 no newline at end of file
plone/app/iterate/containers.py:72:50: C812 missing trailing comma
plone/app/iterate/containers.py:73:14: C812 missing trailing comma
plone/app/iterate/policy.py:57:45: C812 missing trailing comma
plone/app/iterate/policy.py:66:11: T000 Todo note found.
plone/app/iterate/__init__.py:48:78: C812 missing trailing comma
plone/app/iterate/tests/test_iterate.py:152:11: T000 Todo note found.
plone/app/iterate/tests/test_iterate.py:301:80: E501 line too long (97 > 79 characters)
plone/app/iterate/tests/test_doctests.py:19:50: C812 missing trailing comma
plone/app/iterate/tests/test_doctests.py:27:53: C812 missing trailing comma
plone/app/iterate/tests/test_iterate_dx.py:3:1: I001 isort found an import in the wrong position
plone/app/iterate/dexterity/utils.py:25:18: C812 missing trailing comma
plone/app/iterate/dexterity/copier.py:5:1: I001 isort found an import in the wrong position
plone/app/iterate/dexterity/copier.py:67:19: T000 Todo note found.
plone/app/iterate/dexterity/copier.py:157:50: C812 missing trailing comma
plone/app/iterate/browser/checkout.py:70:33: C812 missing trailing comma

Follow these instructions to reproduce it locally.

Please sign in to comment.