Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
language: python
sudo: false
branches:
only:
- master
- /^\d\.\d+$/
- /^\d\.\d+\.\d+(rc\d+|\.dev\d+)?$/
matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 2.7
env: TOXENV=pypy
- python: 2.7
env: TOXENV=pypy3
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
install:
- pip install -U pip tox
script:
- tox
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
VERSION = "0.1.3"

extension = Extension(
name="urlparse4/cgurl",
name="cgurl",
sources=["urlparse4/cgurl.pyx",
"vendor/gurl/base/third_party/icu/icu_utf.cc",
"vendor/gurl/base/strings/string16.cc",
Expand Down Expand Up @@ -43,7 +43,7 @@
from Cython.Build import cythonize
ext_modules = cythonize(extension, annotate=True)
except:
print "urlparse4/gurl.cpp not found and Cython failed to run to recreate it. Please install/upgrade Cython and try again."
print("urlparse4/cgurl.cpp not found and Cython failed to run to recreate it. Please install/upgrade Cython and try again.")
raise
else:
ext_modules = [extension]
Expand Down
8 changes: 7 additions & 1 deletion urlparse4/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# https://github.com/python/cpython/blob/2.7/Lib/urlparse.py

from urlparse import *
import six

if six.PY2:
from urlparse import *
else:
from urllib.parse import *


_original_urlsplit = urlsplit
_original_urljoin = urljoin
Expand Down
Loading