[ipython/f20] Also import urlparse for websocket origin cve

[Thomas Spura]

commit 4893a4d7e5a8690ffed23673ce3da52a16c73a24
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Tue Jul 15 21:31:02 2014 +0200

    Also import urlparse for websocket origin cve

 ipython-0.13.2-websocket-origin-cve.patch |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/ipython-0.13.2-websocket-origin-cve.patch b/ipython-0.13.2-websocket-origin-cve.patch
index 3079bf2..298ca22 100644
--- a/ipython-0.13.2-websocket-origin-cve.patch
+++ b/ipython-0.13.2-websocket-origin-cve.patch
@@ -1,8 +1,20 @@
 diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py
-index 3542346..3721a43 100644
+index 3542346..077dc97 100644
 --- a/IPython/frontend/html/notebook/handlers.py
 +++ b/IPython/frontend/html/notebook/handlers.py
-@@ -369,6 +369,30 @@ class KernelActionHandler(AuthenticatedHandler):
+@@ -16,6 +16,11 @@ Authors:
+ # Imports
+ #-----------------------------------------------------------------------------
+ 
++try:
++    from urllib.parse import urlparse # Py 3
++except ImportError:
++    from urlparse import urlparse # Py 2
++
+ import logging
+ import Cookie
+ import time
+@@ -369,6 +374,30 @@ class KernelActionHandler(AuthenticatedHandler):
  
  class ZMQStreamHandler(websocket.WebSocketHandler):
  
@@ -33,7 +45,7 @@ index 3542346..3721a43 100644
      def _reserialize_reply(self, msg_list):
          """Reserialize a reply message using JSON.
  
-@@ -410,6 +434,11 @@ class ZMQStreamHandler(websocket.WebSocketHandler):
+@@ -410,6 +439,11 @@ class ZMQStreamHandler(websocket.WebSocketHandler):
  class AuthenticatedZMQStreamHandler(ZMQStreamHandler):
  
      def open(self, kernel_id):