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

[jeff.allen]

http://hg.python.org/jython/rev/d7c875ef210a
changeset:   7219:d7c875ef210a
parent:      7218:3fef65b876ec
parent:      7212:02fd15a0075b
user:        Jeff Allen <ja.py at farowl.co.uk>
date:        Wed Apr 23 23:02:05 2014 +0100
summary:
  Merge

files:
  Lib/encodings/idna.py |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Lib/encodings/idna.py b/Lib/encodings/idna.py
--- a/Lib/encodings/idna.py
+++ b/Lib/encodings/idna.py
@@ -1,7 +1,12 @@
 import codecs
 import re
-from com.ibm.icu.text import StringPrep, StringPrepParseException
 from java.net import IDN
+try:
+    # import from jarjar-ed version if available
+    from org.python.icu.text import StringPrep, StringPrepParseException
+except ImportError:
+    # dev version of Jython, so use extlibs
+    from com.ibm.icu.text import StringPrep, StringPrepParseException
 
 
 # IDNA section 3.1

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