Merge branch 'master' into drop_unsupported_versions

.travis.yml

@@ -31,7 +31,7 @@ install:
 
 script:
   - coverage erase
-  - if [[ $(python -c 'import sys; print("0" if sys.version_info < (2, 7) else "1")') == "1" ]]; then flake8 --ignore=E501; fi
+  - if [[ $(python -c 'import sys; print("0" if sys.version_info < (2, 7) else "1")') == "1" ]]; then flake8 --ignore=E501,W605; fi
   - PYTHONPATH=. coverage run -p example/run_tests.py
   - PYTHONPATH=. coverage run -p example/run_tests.py example.settings_no_debug
 after_success:
@@ -42,3 +42,4 @@ notifications:
   email:
     - [email protected]
     - [email protected]
+    - [email protected]

multiselectfield/db/fields.py

@@ -55,8 +55,8 @@ def __init__(self, choices, *args, **kwargs):
         super(MSFList, self).__init__(*args, **kwargs)
 
     def __str__(msgl):
-        list = [msgl.choices.get(int(i)) if i.isdigit() else msgl.choices.get(i) for i in msgl]
-        return u', '.join([string_type(s) for s in list])
+        msg_list = [msgl.choices.get(int(i)) if i.isdigit() else msgl.choices.get(i) for i in msgl]
+        return u', '.join([string_type(s) for s in msg_list])
 
 
 class MultiSelectField(models.CharField):
@@ -74,7 +74,7 @@ def __init__(self, *args, **kwargs):
             self.validators.append(MaxChoicesValidator(self.max_choices))
 
     def _get_flatchoices(self):
-        choices = super(MultiSelectField, self)._get_flatchoices()
+        flat_choices = super(MultiSelectField, self)._get_flatchoices()
 
         class MSFFlatchoices(list):
             # Used to trick django.contrib.admin.utils.display_for_field into
@@ -83,7 +83,7 @@ class MSFFlatchoices(list):
             def __bool__(self):
                 return False
             __nonzero__ = __bool__
-        return MSFFlatchoices(choices)
+        return MSFFlatchoices(flat_choices)
     flatchoices = property(_get_flatchoices)
 
     def get_choices_default(self):

tox.ini

@@ -6,7 +6,7 @@ usedevelop = True
 setenv =
     PYTHONPATH=.
 commands =
-    python {envbindir}/flake8 --ignore=E501
+    python {envbindir}/flake8 --ignore=E501,W605
     python {envbindir}/coverage run -p example/run_tests.py
     python {envbindir}/coverage run -p example/run_tests.py example.settings_no_debug
 install_command =