Merge branch 'topic/modernize_2016' into develop

ArchiveTeam · Jun 2, 2016 · 4d6b668 · 4d6b668
2 parents 77b24f7 + 52321b0
commit 4d6b668
Show file tree

Hide file tree

Showing 254 changed files with 12,636 additions and 12,654 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,16 +2,8 @@ sudo: false
 
 language: python
 python:
-  - 3.2
-  - 3.3
   - 3.4
   - 3.5
-  - pypy3
-
-addons:
-  apt:
-    packages:
-      - liblua5.2-dev
 
 cache:
   directories:
@@ -23,32 +15,20 @@ branches:
   except:
     - topic/rewrite_phantomjs
     - topic/rewrite_phantomjs_2
+    - topic/modernize_2016
 
 
 # command to install dependencies
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' ]]; then
-      travis_retry pip install -q -r requirements.txt;
-    else
-      travis_retry pip install -q -r requirements-pypy.txt;
-    fi
-  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' ]]; then
-      pip install -q git+https://github.com/bastibe/lunatic-python.git@f3f68d2c8638c6f423912264aeb750f5f7eb14ee#egg=lunatic-python;
-    fi
+  - travis_retry pip install -q -r requirements.txt;
   - travis_retry pip install -q coverage python-coveralls warcat youtube-dl
 
 
 # command to run tests
 script:
   - pip install . -t thematrix/ --no-dependencies
-  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' && $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
-      cd thematrix/ && nosetests --with-coverage --cover-package=wpull --cover-branches;
-    else
-      cd thematrix/ && nosetests;
-    fi
+  - cd thematrix/ && nosetests --with-coverage --cover-package=wpull --cover-branches
 
 
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' && $TRAVIS_PYTHON_VERSION != '3.2' ]]; then
-      coveralls;
-    fi
+  - coveralls
diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ Features:
 * Written in Python: lightweight, modifiable, & robust
 * Familiar Wget options and behavior
 * Graceful stopping; on-disk database resume
-* Python & Lua scripting support
+* Python scripting support
 * PhantomJS & youtube-dl integration (experimental)
 
 
@@ -101,7 +101,6 @@ Copyright 2013-2015 by Christopher Foo and others. License GPL v3.
 This project contains third-party source code licensed under different terms:
 
 * wpull.backport.logging
-* wpull.backport.textwrap
 * wpull.thirdparty.robotexclusionrulesparser
 * wpull.thirdparty.dammit
 

diff --git a/doc/api.rst b/doc/api.rst
@@ -10,9 +10,9 @@ Here lists all documented classes and functions. Not all members are documented
 
 If the documentation is not sufficient, please take a look at the source code. Suggestions and improvements are welcomed.
 
-.. Note:: The API is not thread-safe. It is intended to be run asynchronously with Trollius.
+.. Note:: The API is not thread-safe. It is intended to be run asynchronously with Asyncio.
 
-    Many functions also are decorated with the :func:`trollius.coroutine` decorator. For more information, see http://trollius.readthedocs.org/.
+    Many functions also are decorated with the :func:`asyncio.coroutine` decorator. For more information, see https://docs.python.org/3/library/asyncio.html.
 
 
 wpull Package

diff --git a/doc/api/abstract.stream.rst b/doc/api/abstract.stream.rst
diff --git a/doc/api/ftp.client.rst b/doc/api/ftp.client.rst
diff --git a/doc/api/ftp.command.rst b/doc/api/ftp.command.rst
diff --git a/doc/api/ftp.ls.date.rst b/doc/api/ftp.ls.date.rst
diff --git a/doc/api/ftp.ls.listing.rst b/doc/api/ftp.ls.listing.rst
diff --git a/doc/api/ftp.ls.rst b/doc/api/ftp.ls.rst
diff --git a/doc/api/ftp.request.rst b/doc/api/ftp.request.rst
diff --git a/doc/api/ftp.rst b/doc/api/ftp.rst
diff --git a/doc/api/ftp.stream.rst b/doc/api/ftp.stream.rst
diff --git a/doc/api/ftp.util.rst b/doc/api/ftp.util.rst
diff --git a/doc/api/http.chunked.rst b/doc/api/http.chunked.rst
diff --git a/doc/api/http.client.rst b/doc/api/http.client.rst
diff --git a/doc/api/http.request.rst b/doc/api/http.request.rst
diff --git a/doc/api/http.robots.rst b/doc/api/http.robots.rst
diff --git a/doc/api/http.rst b/doc/api/http.rst
diff --git a/doc/api/http.stream.rst b/doc/api/http.stream.rst
diff --git a/doc/api/http.util.rst b/doc/api/http.util.rst
diff --git a/doc/api/http.web.rst b/doc/api/http.web.rst
diff --git a/doc/api/protocol.abstract.client.rst b/doc/api/protocol.abstract.client.rst
@@ -0,0 +1,12 @@
+.. This document was automatically generated.
+   DO NOT EDIT!
+
+:mod:`protocol.abstract.client` Module
+======================================
+
+.. automodule:: wpull.protocol.abstract.client
+    :members:
+    :show-inheritance:
+    :private-members:
+    :special-members:
+    :exclude-members: __dict__,__weakref__
diff --git a/doc/api/protocol.abstract.request.rst b/doc/api/protocol.abstract.request.rst
@@ -0,0 +1,12 @@
+.. This document was automatically generated.
+   DO NOT EDIT!
+
+:mod:`protocol.abstract.request` Module
+=======================================
+
+.. automodule:: wpull.protocol.abstract.request
+    :members:
+    :show-inheritance:
+    :private-members:
+    :special-members:
+    :exclude-members: __dict__,__weakref__
diff --git a/doc/api/abstract.request.rst → doc/api/protocol.abstract.rst b/doc/api/abstract.request.rst → doc/api/protocol.abstract.rst
@@ -1,10 +1,10 @@
 .. This document was automatically generated.
    DO NOT EDIT!
 
-:mod:`abstract.request` Module
-==============================
+:mod:`protocol.abstract` Module
+===============================
 
-.. automodule:: wpull.abstract.request
+.. automodule:: wpull.protocol.abstract
     :members:
     :show-inheritance:
     :private-members:

diff --git a/doc/api/protocol.abstract.stream.rst b/doc/api/protocol.abstract.stream.rst
@@ -0,0 +1,12 @@
+.. This document was automatically generated.
+   DO NOT EDIT!
+
+:mod:`protocol.abstract.stream` Module
+======================================
+
+.. automodule:: wpull.protocol.abstract.stream
+    :members:
+    :show-inheritance:
+    :private-members:
+    :special-members:
+    :exclude-members: __dict__,__weakref__
diff --git a/doc/api/protocol.ftp.client.rst b/doc/api/protocol.ftp.client.rst
@@ -0,0 +1,12 @@
+.. This document was automatically generated.
+   DO NOT EDIT!
+
+:mod:`protocol.ftp.client` Module
+=================================
+
+.. automodule:: wpull.protocol.ftp.client
+    :members:
+    :show-inheritance:
+    :private-members:
+    :special-members:
+    :exclude-members: __dict__,__weakref__
diff --git a/doc/api/protocol.ftp.command.rst b/doc/api/protocol.ftp.command.rst
@@ -0,0 +1,12 @@
+.. This document was automatically generated.
+   DO NOT EDIT!
+
+:mod:`protocol.ftp.command` Module
+==================================
+
+.. automodule:: wpull.protocol.ftp.command
+    :members:
+    :show-inheritance:
+    :private-members:
+    :special-members:
+    :exclude-members: __dict__,__weakref__