Merge 03c1c2d into 93a7c2d

.travis.yml

@@ -1,24 +1,29 @@
 language: python
 python: 2.7
+sudo: false
+cache:
+  directories:
+  - eggs
 env:
-  - PLONE_VERSION=4.2
-  - PLONE_VERSION=4.3 QA=true
+- PLONE_VERSION=4.2
+- PLONE_VERSION=4.3
 matrix:
-  allow_failures:
-    - env: PLONE_VERSION=4.2
   fast_finish: true
 install:
-  - sed -ie "s#travis-4.x.cfg#travis-$PLONE_VERSION.x.cfg#" travis.cfg
-  - mkdir -p buildout-cache/downloads
-  - python bootstrap.py -c travis.cfg
-  - bin/buildout -c travis.cfg annotate
-  - bin/buildout -c travis.cfg -N -q
+- sed -ie "s#test-4.x#test-$PLONE_VERSION#" buildout.cfg
+- python bootstrap.py
+- bin/buildout annotate
+- bin/buildout -Nq
 before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - firefox -v
-script: bin/test
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
+- firefox -v
+script:
+- bin/code-analysis
+- bin/test
 after_success:
-  - test $QA && bin/coverage.sh && pip install -q coveralls && coveralls || true
+- bin/createcoverage -t "--layer=!Robot"
+- pip install -q coveralls
+- coveralls
 notifications:
   irc: irc.freenode.org#plone-testing

CHANGES.rst

@@ -1,10 +1,14 @@
-There's a frood who really knows where his towel is
----------------------------------------------------
+Changelog
+---------
+
+There's a frood who really knows where his towel is.
 
 1.0b12 (unreleased)
 ^^^^^^^^^^^^^^^^^^^
 
 - Fix JS to be jQuery 1.9 compat
+  [simahawk]
+
 - Make CSS resources render as <link />
   [simahawk]
 
@@ -23,8 +27,8 @@ There's a frood who really knows where his towel is
   ``plone.formwidget.autocomplete``.
   [rnixx]
 
-- remove zope.i18n from package dependencies in order to avoid 
-  conflicting zcml with between zope.i18n and Zope2 Publihser 
+- remove zope.i18n from package dependencies in order to avoid
+  conflicting zcml with between zope.i18n and Zope2 Publihser
   i18n.zcml
   [jensens]
 

MANIFEST.in

@@ -1,6 +1,4 @@
-include *.rst
-
-recursive-include src *
-recursive-include docs *
-
 global-exclude *.pyc
+graft docs
+graft src
+include *.rst

README.rst

@@ -10,7 +10,7 @@ Life, the Universe, and Everything
 A widget package for Dexterity projects.
 
 .. Warning::
-    This package is no longer being actively maintained.
+    This package will no longer be actively maintained.
     Take a look at `plone.app.widgets`_ for an alternative set of widgets.
 
 collective.z3cform.widgets provides the following widgets:
@@ -47,7 +47,9 @@ collective.z3cform.widgets provides the following widgets:
 
 **MultiContentSearchFieldWidget**
     A widget to add a dynamic list of objects. This works as a widget for
-    related items field so it must be used like this::
+    related items field so it must be used like this:
+
+.. code-block::
 
         relatedItems = RelationList(
             title=_(u'label_related_items', default=u'Related Items'),
@@ -80,18 +82,15 @@ collective.z3cform.widgets provides the following widgets:
 Mostly Harmless
 ---------------
 
-.. image:: https://secure.travis-ci.org/collective/collective.z3cform.widgets.png?branch=master
-    :alt: Travis CI badge
+.. image:: http://img.shields.io/pypi/v/collective.z3cform.widgets.svg
+    :target: https://pypi.python.org/pypi/collective.z3cform.widgets
+
+.. image:: https://img.shields.io/travis/collective/collective.z3cform.widgets/master.svg
     :target: http://travis-ci.org/collective/collective.z3cform.widgets
 
-.. image:: https://coveralls.io/repos/collective/collective.z3cform.widgets/badge.png?branch=master
-    :alt: Coveralls badge
+.. image:: https://img.shields.io/coveralls/collective/collective.z3cform.widgets/master.svg
     :target: https://coveralls.io/r/collective/collective.z3cform.widgets
 
-.. image:: https://pypip.in/d/collective.z3cform.widgets/badge.png
-    :alt: Downloads
-    :target: https://pypi.python.org/pypi/collective.z3cform.widgets
-
 Got an idea? Found a bug? Let us know by `opening a support ticket`_.
 
 Don't Panic
@@ -128,6 +127,8 @@ New fields
     To use this widget we must use a List field or a Tuple field with the
     value_type as an schema.TextLine() like this::
 
+.. code-block::
+
         from collective.z3cform.widgets.enhancedtextlines import EnhancedTextLinesFieldWidget
 
         form.widget(options = EnhancedTextLinesFieldWidget)
@@ -141,6 +142,8 @@ New fields
     To use this Widget we must use a List field or a Tuple field with the
     value_type as a schema.TextLine() like this::
 
+.. code-block::
+
         from collective.z3cform.widgets.token_input_widget import TokenInputFieldWidget
 
         form.widget(subjects=TokenInputFieldWidget)
@@ -155,6 +158,8 @@ New fields
     the search of elements to relate to.. if none parameter are passed, a tree
     structure is shown in the widget::
 
+.. code-block::
+
         from collective.z3cform.widgets.multicontent_search_widget import MultiContentSearchFieldWidget
 
         form.widget(relatedItems=MultiContentSearchFieldWidget)

buildout.cfg

@@ -9,18 +9,28 @@ package-extras = [test]
 
 parts +=
     code-analysis
+    createcoverage
     i18ndude
     node
     omelette
     rebuild_i18n-sh
 
 [code-analysis]
+recipe = plone.recipe.codeanalysis
 directory = ${buildout:directory}/src/collective/z3cform/widgets
-pre-commit-hook = True
+clean-lines = True
+clean-lines-exclude = ${buildout:directory}/src/collective/z3cform/widgets/static
 csslint = True
-csslint-bin = ${buildout:directory}/bin/csslint
+csslint-bin = bin/csslint
 deprecated-aliases = True
+flake8-extensions =
+#    flake8-blind-except
+    flake8-coding
+    flake8-debugger
+#    flake8-quotes
 flake8-ignore = E501
+multiprocessing = True
+return-status-codes = False
 
 [i18ndude]
 recipe = zc.recipe.egg
@@ -29,3 +39,8 @@ eggs = i18ndude
 [omelette]
 recipe = collective.recipe.omelette
 eggs = ${instance:eggs}
+
+[versions]
+plone.recipe.codeanalysis = 2.0b1
+# use latest version of setuptools
+setuptools =

src/collective/z3cform/widgets/configure.zcml

@@ -53,9 +53,9 @@
         provides="Products.GenericSetup.interfaces.EXTENSION"
         />
 
-  	<genericsetup:upgradeSteps
-      	source="1"
-      	destination="2"
+    <genericsetup:upgradeSteps
+        source="1"
+        destination="2"
         profile="collective.z3cform.widgets:default">
 
         <genericsetup:upgradeStep

src/collective/z3cform/widgets/interfaces.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import zope.interface
 from z3c.form import interfaces
 

src/collective/z3cform/widgets/multicontent_search_widget.py

@@ -104,7 +104,7 @@ def update(self):
 
         try:
             self.related_batch = int(self.request.get("related_batch", 1))
-        except:
+        except:  # FIXME
             self.related_batch = 1
 
         if prev:

src/collective/z3cform/widgets/profiles/default/jsregistry.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <object name="portal_javascripts">
 
-  <javascript id="++resource++plone.formwidget.autocomplete/jquery.autocomplete.min.js" 
+  <javascript id="++resource++plone.formwidget.autocomplete/jquery.autocomplete.min.js"
       cacheable="True" compression="none" cookable="True" enabled="True"
       expression="" inline="False"
       insert-after="collective.js.jqueryui.custom.min.js" />
-  <javascript id="++resource++plone.formwidget.autocomplete/formwidget-autocomplete.js" 
+  <javascript id="++resource++plone.formwidget.autocomplete/formwidget-autocomplete.js"
       cacheable="True" compression="safe" cookable="True" enabled="True"
       expression="" inline="False"
       insert-after="++resource++plone.formwidget.autocomplete/jquery.autocomplete.min.js" />
@@ -29,10 +29,10 @@
   <javascript id="++resource++collective.z3cform.widgets/jquery.tasksplease.js"
       cacheable="True" compression="none" cookable="True" enabled="True"
       expression="" inline="False" authenticated="True"
-      insert-after="++resource++collective.z3cform.widgets/keywords.js" />  
+      insert-after="++resource++collective.z3cform.widgets/keywords.js" />
   <javascript id="++resource++collective.z3cform.widgets/jquery.rte.js"
       cacheable="True" compression="none" cookable="True" enabled="True"
       expression="" inline="False" authenticated="True"
       insert-after="++resource++collective.z3cform.widgets/jquery.tasksplease.js" />
 
-</object>
+</object>

src/collective/z3cform/widgets/related_selected.pt

@@ -4,7 +4,7 @@
             <tal:level>
               <tal:block>
                 <a tal:attributes="href item_url;">
-                    
+
                     <span tal:content="python: node['label']" i18n:translate="">Selected Item Title</span>
                 </a>
               </tal:block>

src/collective/z3cform/widgets/simple_rich_text.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 from zope.interface import classImplements