[Jython-checkins] jython (merge 2.5 -> default): Merge 2.5.

[frank.wierzbicki]

http://hg.python.org/jython/rev/44166daa989b
changeset:   7002:44166daa989b
parent:      7000:353121061da9
parent:      7001:328c4e80117f
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Feb 06 14:05:50 2013 -0800
summary:
  Merge 2.5.

files:
  ACKNOWLEDGMENTS                       |  1 +
  NEWS                                  |  1 +
  src/org/python/modules/time/Time.java |  5 +++++
  3 files changed, 7 insertions(+), 0 deletions(-)


diff --git a/ACKNOWLEDGMENTS b/ACKNOWLEDGMENTS
--- a/ACKNOWLEDGMENTS
+++ b/ACKNOWLEDGMENTS
@@ -98,6 +98,7 @@
     Jeff Allen
     Julian Kennedy
     Arfrever Frehtes Taifersar Arahesis
+    Andreas Stührk
 
 Local Variables:
 mode: indented-text
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@
 
 Jython 2.5.4rc1
   Bugs Fixed
+    - [ 1481 ] jython throws java.lang.IllegalArgumentException instead of ValueError.
     - [ 1716 ] xrange slicing raises NPE.
 
 Jython 2.5.3rc1
diff --git a/src/org/python/modules/time/Time.java b/src/org/python/modules/time/Time.java
--- a/src/org/python/modules/time/Time.java
+++ b/src/org/python/modules/time/Time.java
@@ -780,6 +780,11 @@
                     builder.append("'");
                     inQuote = needsQuote;
                 }
+                if (charAt == '\'') {
+                    // a single quote always needs to be escaped, regardless
+                    // whether already in a quote or not
+                    builder.append("'");
+                }
                 builder.append(charAt);
                 continue;
             } else if (inQuote) {

-- 
Repository URL: http://hg.python.org/jython