From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 4 Aug 2009 21:57:18 +0000 (+0000)
Subject: Merged revisions 74312 via svnmerge from
X-Git-Tag: v3.2a1~2704
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbffb25c69f748a8842bb16718d79b86ad16b867;p=python

Merged revisions 74312 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r74312 | mark.dickinson | 2009-08-04 22:56:04 +0100 (Tue, 04 Aug 2009) | 4 lines

  Issue #6620: Slightly safer code for _grouping_intervals in the locale
  module.  Fixes a 'possible use before assignment' warning from pylint.
  Thanks Vincent Legoll.
........
---

diff --git a/Lib/locale.py b/Lib/locale.py
index f6d174c859..4ab3c6a48c 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -121,12 +121,15 @@ def localeconv():
 
 # Iterate over grouping intervals
 def _grouping_intervals(grouping):
+    last_interval = None
     for interval in grouping:
         # if grouping is -1, we are done
         if interval == CHAR_MAX:
             return
         # 0: re-use last group ad infinitum
         if interval == 0:
+            if last_interval is None:
+                raise ValueError("invalid grouping")
             while True:
                 yield last_interval
         yield interval