From 40594146d10232633cbbbb17031a309b11973e98 Mon Sep 17 00:00:00 2001
From: Juda Kaleta <juda.kaleta@gmail.com>
Date: Thu, 22 Aug 2013 14:29:08 +0200
Subject: [PATCH] Support of Py3 without py2to3

---
 .coveragerc             | 3 ---
 .travis.yml             | 4 +++-
 embed_video/backends.py | 8 +++++++-
 setup.py                | 9 +--------
 4 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 7a61814..0000000
--- a/.coveragerc
+++ /dev/null
@@ -1,3 +0,0 @@
-[run]
-source = .
-omit = build/*
diff --git a/.travis.yml b/.travis.yml
index ab51167..0241451 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,9 @@ install:
     - pip install coveralls --use-mirrors
     - pip install mock --use-mirrors
     - pip install south --use-mirrors
+    - pip install nose
 script:
-    - coverage run setup.py test
+    - python setup.py build
+    - nosetests --with-coverage --cover-package=embed_video --cover-tests --cover-erase
 after_success:
     - coveralls
diff --git a/embed_video/backends.py b/embed_video/backends.py
index b562648..fa137b3 100644
--- a/embed_video/backends.py
+++ b/embed_video/backends.py
@@ -1,5 +1,11 @@
+import sys
 import re
-import urlparse
+
+if sys.version_info >= (3, ):
+    import urllib.parse as urlparse
+else:
+    import urlparse
+
 import requests
 import json
 
diff --git a/setup.py b/setup.py
index 015896e..9244d07 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,6 @@ def read(fname):
 README = read('README.rst')
 CHANGES = read('CHANGES.rst')
 
-extra_kwargs = {}
-
-if sys.version_info >= (3,):
-    extra_kwargs = {'use_2to3': True}
-
 setup(
     name='django-embed-video',
     packages=find_packages(),
@@ -31,7 +26,5 @@ setup(
         'Topic :: Internet :: WWW/HTTP',
     ],
     keywords=['youtube', 'vimeo', 'video'],
-    test_suite='embed_video.tests.tests',
-    install_requires=['requests >= 1.2.3',],
-    **extra_kwargs
+    install_requires=['requests >= 1.2.3', ],
 )