fixes som py3.4 tests

.travis.yml

@@ -39,7 +39,7 @@ install:
   - pip install tox
 
 script:
-  - tox -e "d${DJANGO//.}-py${TRAVIS_PYTHON_VERSION//.}" -- py.test src tests --doctest-modules -vv --capture=no --cov=adminactions --cov-report= --cov-config=tests/.coveragerc
+  - tox -e "d${DJANGO//.}-py${TRAVIS_PYTHON_VERSION//.}" -- py.test src tests -W ignore --doctest-modules -vv --capture=no --cov=adminactions --cov-report= --cov-config=tests/.coveragerc
 
 before_success:
   - coverage erase

src/adminactions/templatetags/massupdate.py

@@ -35,8 +35,8 @@ def fields_values(d, k):
 def link_fields_values(d, k):
     """
     >>> data = {'name1': ['value1.1', 'value1.2'], 'name2': ['value2.1', 'value2.2'], }
-    >>> link_fields_values(data, 'name1')
-    u'<a href="#" class="fastfieldvalue name1 value">value1.1</a>, <a href="#" class="fastfieldvalue name1 value">value1.2</a>'
+    >>> print(link_fields_values(data, 'name1'))
+    <a href="#" class="fastfieldvalue name1 value">value1.1</a>, <a href="#" class="fastfieldvalue name1 value">value1.2</a>
     """
     ret = []
     for v in d.get(k, []):
@@ -60,10 +60,10 @@ class SelectOptionsAttribute(widgets.Select):
         Select widget with the capability to render option's attributes
         
     >>> opt = SelectOptionsAttribute()
-    >>> opt.render_option(["1"], 1,"a")
-    u'<option value="1" selected="selected">a</option>'
-    >>> opt.render_option([], 1,"a")
-    u'<option value="1">a</option>'
+    >>> opt.render_option(["1"], 1, "a") == '<option value="1" selected="selected">a</option>'
+    True
+    >>> opt.render_option([], 1, "a") == '<option value="1">a</option>'
+    True
     """
     def __init__(self, attrs=None, choices=(), options_attributes=None):
         self.options_attributes = options_attributes or {}

src/adminactions/templatetags/merge.py

@@ -23,8 +23,8 @@ def form_widget_error(form, fieldname):
     >>> from django.forms import ModelForm, modelform_factory
     >>> from django.contrib.auth.models import User
     >>> f = modelform_factory(User, fields=["username"])({}, instance=User())
-    >>> form_widget_error(f, "username")
-    [u'This field is required.']
+    >>> form_widget_error(f, "username") == ['This field is required.']
+    True
     """
     return form[fieldname].errors
 

src/adminactions/utils.py

@@ -198,14 +198,6 @@ def get_verbose_name(model_or_queryset, field):
     True
     >>> get_verbose_name(p, 'content_type.model') == 'python model class name' 
     True
-    >>> get_verbose_name(object, 'aaa')
-    Traceback (most recent call last):
-    ...
-    ValueError: `get_verbose_name` expects Manager, Queryset or Model as first parameter (got <type 'type'>)
-    >>> get_verbose_name(p, None)
-    Traceback (most recent call last):
-    ...
-    ValueError: `get_verbose_name` field_path must be string or Field class
     """
 
     if isinstance(model_or_queryset, models.Manager):

tests/test_utils.py

@@ -28,6 +28,9 @@ def test_get_verbose_name():
     with pytest.raises(ValueError):
         get_verbose_name(object, 'aaa')
 
+    with pytest.raises(ValueError):
+        get_verbose_name(p, None)
+
 
 def test_flatten():
     from adminactions.utils import flatten

tox.ini

@@ -47,7 +47,7 @@ deps=
 
 
 commands=
-    {posargs:py.test tests/}
+    {posargs:py.test tests/ src --doctest-modules }
 
 [testenv:py27-ddev]
 ignore_outcome = true