Merge pull request #34 from plone/plone-base-overhault

Plone base overhault

news/34.breaking

@@ -0,0 +1,2 @@
+Use plone.base. Remove six and Archetypes specific code.
+[jensens]

plone/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)

plone/app/__init__.py

@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__import__('pkg_resources').declare_namespace(__name__)
+__import__("pkg_resources").declare_namespace(__name__)

plone/app/contentmenu/__init__.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
 from zope.i18nmessageid import MessageFactory
 
 
-PloneMessageFactory = MessageFactory('plone')
+PloneMessageFactory = MessageFactory("plone")

plone/app/contentmenu/displayviewsmenu.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.app.contentmenu.interfaces import IDisplayViewsMenu
 from zope.browsermenu.menu import BrowserMenu
 from zope.component import getAdapters
@@ -7,19 +6,17 @@
 
 @implementer(IDisplayViewsMenu)
 class DisplayViewsMenu(BrowserMenu):
-
     def getMenuItemByAction(self, context, request, action):
         # Normalize actions; strip view prefix
-        if action.startswith('@@'):
+        if action.startswith("@@"):
             action = action[2:]
-        if action.startswith('++view++'):
+        if action.startswith("++view++"):
             action = action[8:]
 
-        for name, item in getAdapters((context, request),
-                                      self.getMenuItemType()):
+        for name, item in getAdapters((context, request), self.getMenuItemType()):
             item_action = item.action
             # Normalize menu item action; never uses ++view++
-            if item_action.startswith('@@'):
+            if item_action.startswith("@@"):
                 item_action = item_action[2:]
 
             if item_action == action:

plone/app/contentmenu/interfaces.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from zope.browsermenu.interfaces import IBrowserMenu
 from zope.browsermenu.interfaces import IBrowserSubMenuItem
 from zope.browsermenu.interfaces import IMenuItemType
@@ -14,8 +13,7 @@ class IContentMenuView(IContentProvider):
     """
 
     def available():
-        """Determine whether the menu should be displayed at all.
-        """
+        """Determine whether the menu should be displayed at all."""
 
     def menu():
         """Create a list of dicts that can be used to render a menu.
@@ -25,6 +23,7 @@ def menu():
         submenu
         """
 
+
 # The content menu itself - menu items are registered as adapters to this
 # interface (this is signalled by marking the interface itself with the
 # IInterface IMenuItemType)
@@ -57,8 +56,7 @@ class IContentMenuItem(Interface):
 
 
 class IActionsSubMenuItem(IBrowserSubMenuItem):
-    """The menu item linking to the actions menu.
-    """
+    """The menu item linking to the actions menu."""
 
 
 class IActionsMenu(IBrowserMenu):
@@ -69,8 +67,7 @@ class IActionsMenu(IBrowserMenu):
 
 
 class IDisplaySubMenuItem(IBrowserSubMenuItem):
-    """The menu item linking to the display menu.
-    """
+    """The menu item linking to the display menu."""
 
     def disabled(self):
         """Find out if the menu is visible but disabled."""
@@ -84,8 +81,7 @@ class IDisplayMenu(IBrowserMenu):
 
 
 class IFactoriesSubMenuItem(IBrowserSubMenuItem):
-    """The menu item linking to the factories menu.
-    """
+    """The menu item linking to the factories menu."""
 
 
 class IFactoriesMenu(IBrowserMenu):
@@ -97,8 +93,7 @@ class IFactoriesMenu(IBrowserMenu):
 
 
 class IWorkflowSubMenuItem(IBrowserSubMenuItem):
-    """The menu item linking to the workflow menu.
-    """
+    """The menu item linking to the workflow menu."""
 
 
 class IWorkflowMenu(IBrowserMenu):
@@ -110,8 +105,7 @@ class IWorkflowMenu(IBrowserMenu):
 
 
 class IPortletManagerSubMenuItem(IBrowserSubMenuItem):
-    """The menu item linking to the portlet manager menu.
-    """
+    """The menu item linking to the portlet manager menu."""
 
 
 class IPortletManagerMenu(IBrowserMenu):