[Python-checkins] r74312 - python/trunk/Lib/locale.py

[mark.dickinson]

Author: mark.dickinson
Date: Tue Aug  4 23:56:04 2009
New Revision: 74312

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


Modified:
   python/trunk/Lib/locale.py

Modified: python/trunk/Lib/locale.py
==============================================================================
--- python/trunk/Lib/locale.py	(original)
+++ python/trunk/Lib/locale.py	Tue Aug  4 23:56:04 2009
@@ -114,12 +114,15 @@
 
 # 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