Switch from PIL to Pillow, remove workarounds.

.travis.yml

@@ -2,24 +2,21 @@ language: python
 python:
   - "2.7"
   - "3.3"
+  - "3.4"
 # whitelist
 branches:
   only:
     - master
-# install libjpeg-dev for PIL to handle JPEGs
+# install libjpeg-dev for Pillow to handle JPEGs
 before_install:
   - sudo apt-get update -q -y
   - sudo apt-get install -q -y libjpeg-dev
-  - sudo ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib
-  - sudo ln -s /usr/lib/x86_64-linux-gnu/libfreetype.so /usr/lib
-  - sudo ln -s /usr/lib/x86_64-linux-gnu/libz.so /usr/lib
 # disabled upgrade: it gives build errors
 #  - sudo apt-get upgrade -q -y
 # command to install dependencies
 install:
-  - pip install -r requirements.txt --use-mirrors
+  - pip install -r requirements.txt
-  - scripts/install_pil.sh
+  - pip install pytest-xdist
-  - pip install pytest-xdist --use-mirrors
 # command to run tests
 script: make test PYTESTOPTS="--tb=short -n10"
 #notifications:

requirements.txt

@@ -3,3 +3,5 @@ requests
 # optional:
 argcomplete
 lxml
+cssselect
+Pillow

scripts/install_pil.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-# Install PIL in Travis CI environment for Python 2.x builds.
-set -e
-set -u
-
-if python -c 'import sys; sys.exit(0 if sys.hexversion<0x03000000 else 1)'; then
-  pip install --allow-external PIL --allow-unverified PIL PIL
-fi