Merge branch 'default' into ha-feature-pypy

Author: BanzaiMan

.travis.yml

@@ -27,8 +27,7 @@ before_script:
 - 'export ARCH=${ARCH:-$(uname -m)}'
 - 'export PACKAGES=${PACKAGES:-pip nose pytest mock wheel}'
 - 'export CPYTHON_ONLY_PKGS="numpy"'
-- export PYTHON_COFIGURE_OPTS="$CONFIGURE_OPTS --enable-unicode=ucs4"
-
+- export PYTHON_CONFIGURE_OPTS="--with-wide-unicode --enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos $CONFIGURE_OPTS"
 script: ./bin/compile
 
 after_success: ./bin/archive

bin/compile

@@ -40,6 +40,8 @@ if [[ $ALIAS ]] ; then
   ln -s $HOME/virtualenv/$VIRTENV_VERSION $HOME/virtualenv/python$ALIAS
 fi
 
+$HOME/virtualenv/$VIRTENV_VERSION/bin/python -c "import sys; assert sys.maxunicode > 65535"
+
 if [[ $PACKAGES ]] ; then
   $HOME/virtualenv/$VIRTENV_VERSION/bin/pip install --upgrade $PACKAGES
 fi