Ticket #7020: lists-to-tuples.diff

django/oldforms/__init__.py

@@ -953 +953 @@
         if match is not None:
             import re
             match_re = re.compile(match)
-        choices = not is_required and BLANK_CHOICE_DASH[:] or []
+        choices = not is_required and [BLANK_CHOICE_DASH] or []
         if recursive:
             for root, dirs, files in os.walk(path):
                 for f in files:

django/db/models/fields/__init__.py

@@ -28 +28 @@
 HORIZONTAL, VERTICAL = 1, 2
 
 # The values to use for "blank" in SelectFields. Will be appended to the start of most "choices" lists.
-BLANK_CHOICE_DASH = [("", "---------")]
-BLANK_CHOICE_NONE = [("", "None")]
+BLANK_CHOICE_DASH = ("", "---------")
+BLANK_CHOICE_NONE = ("", "None")
 
 # prepares a value for use in a LIKE query
 prep_for_like_query = lambda x: smart_unicode(x).replace("\\", "\\\\").replace("%", "\%").replace("_", "\_")
@@ -345 +345 @@
             val = None
         return val
 
-    def get_choices(self, include_blank=True, blank_choice=BLANK_CHOICE_DASH):
+    def get_choices(self, include_blank=True, blank_choice=[BLANK_CHOICE_DASH]):
         "Returns a list of tuples used as SelectField choices for this field."
         first_choice = include_blank and blank_choice or []
         if self.choices:
@@ -359 +359 @@
 
     def get_choices_default(self):
         if self.radio_admin:
-            return self.get_choices(include_blank=self.blank, blank_choice=BLANK_CHOICE_NONE)
+            return self.get_choices(include_blank=self.blank, blank_choice=[BLANK_CHOICE_NONE])
         else:
             return self.get_choices()
 

django/utils/_decimal.py

@@ -370 +370 @@
     """
 
 # List of public traps and flags
-_signals = [Clamped, DivisionByZero, Inexact, Overflow, Rounded,
-           Underflow, InvalidOperation, Subnormal]
+_signals = (Clamped, DivisionByZero, Inexact, Overflow, Rounded,
+           Underflow, InvalidOperation, Subnormal)
 
 # Map conditions (per the spec) to signals
 _condition_map = {ConversionSyntax:InvalidOperation,
@@ -2164 +2164 @@
 
 
 # get rounding method function:
-rounding_functions = [name for name in Decimal.__dict__.keys() if name.startswith('_round_')]
-for name in rounding_functions:
+for name in Decimal.__dict__.iterkeys():
+    if not name.startswith('_round_'):
+        continue
     #name is like _round_half_even, goes to the global ROUND_HALF_EVEN value.
     globalname = name[1:].upper()
     val = globals()[globalname]
     Decimal._pick_rounding_function[val] = name
 
-del name, val, globalname, rounding_functions
+del name, val, globalname
 
 class Context(object):
     """Contains the context for a Decimal instance.

django/utils/html.py

@@ -9 +9 @@
 from django.utils.http import urlquote
 
 # Configuration for urlize() function.
-LEADING_PUNCTUATION  = ['(', '<', '&lt;']
-TRAILING_PUNCTUATION = ['.', ',', ')', '>', '\n', '&gt;']
+LEADING_PUNCTUATION  = ('(', '<', '&lt;')
+TRAILING_PUNCTUATION = ('.', ',', ')', '>', '\n', '&gt;')
 
 # List of possible strings used for bullets in bulleted lists.
-DOTS = ['&middot;', '*', '\xe2\x80\xa2', '&#149;', '&bull;', '&#8226;']
+DOTS = ('&middot;', '*', '\xe2\x80\xa2', '&#149;', '&bull;', '&#8226;')
 
 unencoded_ampersands_re = re.compile(r'&(?!(\w+|#\d+);)')
 word_split_re = re.compile(r'(\s+)')

django/utils/simplejson/decoder.py

@@ -183 +183 @@
     return values, end
 pattern(r'\[')(JSONArray)
  
-ANYTHING = [
+ANYTHING = (
     JSONObject,
     JSONArray,
     JSONString,
     JSONConstant,
     JSONNumber,
-]
+)
 
 JSONScanner = Scanner(ANYTHING)