From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 26 May 2014 00:49:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'rgbkrk/cross_origin' into merge
X-Git-Tag: v4.0.0b1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc8dcecef263e2f531a89806262a368ca4a38f90;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'rgbkrk/cross_origin' into merge
---

cc8dcecef263e2f531a89806262a368ca4a38f90
diff --cc tornado/websocket.py
index bfb90d180,6f552f71d..d797a0cd2
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@@ -37,10 -37,15 +37,15 @@@ from tornado import httpclient, httputi
  from tornado.ioloop import IOLoop
  from tornado.iostream import StreamClosedError
  from tornado.log import gen_log, app_log
 -from tornado.netutil import Resolver
  from tornado import simple_httpclient
 +from tornado.tcpclient import TCPClient
  from tornado.util import bytes_type, unicode_type
  
+ try:
+     from urllib.parse import urlparse # py2
+ except ImportError:
+     from urlparse import urlparse # py3
+ 
  try:
      xrange  # py2
  except NameError: