[Python-modules-commits] [python-scrapy] 04/09: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Tue Jun 20 10:10:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-scrapy.
commit 185ea1d15e70a91840551c8138f11f2eea75d00b
Merge: 05601a1 283903b
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon May 29 10:12:02 2017 +0200
merge patched into master
.bumpversion.cfg | 23 +-
.gitignore | 2 +
.travis.yml | 4 +-
LICENSE | 6 +-
README.rst | 4 -
codecov.yml | 6 +
debian/.git-dpm | 6 +-
...with-unattainable-dependencies-in-Python3.patch | 6 +-
docs/Makefile | 6 +-
docs/README.rst | 4 +-
docs/contributing.rst | 9 -
docs/faq.rst | 3 +-
docs/intro/install.rst | 78 +-
docs/intro/overview.rst | 3 +-
docs/intro/tutorial.rst | 73 +-
docs/news.rst | 204 +++++
docs/requirements.txt | 2 +
docs/topics/commands.rst | 6 +-
docs/topics/downloader-middleware.rst | 23 +-
docs/topics/exporters.rst | 31 +-
docs/topics/extensions.rst | 1 -
docs/topics/feed-exports.rst | 17 +
docs/topics/item-pipeline.rst | 5 +-
docs/topics/link-extractors.rst | 20 +-
docs/topics/logging.rst | 14 +-
docs/topics/media-pipeline.rst | 12 +
docs/topics/practices.rst | 2 +-
docs/topics/request-response.rst | 41 +-
docs/topics/selectors.rst | 13 +-
docs/topics/settings.rst | 100 ++-
docs/topics/spider-middleware.rst | 86 +-
docs/topics/spiders.rst | 29 +-
requirements-py3.txt | 2 +-
requirements.txt | 2 +-
scrapy/VERSION | 2 +-
scrapy/__main__.py | 4 +
scrapy/cmdline.py | 11 +-
scrapy/commands/edit.py | 4 +-
scrapy/core/downloader/contextfactory.py | 8 +-
scrapy/core/downloader/handlers/datauri.py | 23 +
scrapy/core/downloader/handlers/ftp.py | 28 +-
scrapy/core/downloader/handlers/http11.py | 77 +-
scrapy/core/engine.py | 4 +-
scrapy/crawler.py | 9 +-
scrapy/downloadermiddlewares/httpcompression.py | 22 +-
scrapy/downloadermiddlewares/httpproxy.py | 25 +-
scrapy/downloadermiddlewares/retry.py | 16 +-
scrapy/downloadermiddlewares/stats.py | 4 +-
scrapy/exporters.py | 46 +-
scrapy/extensions/feedexport.py | 5 +-
scrapy/extensions/httpcache.py | 11 +-
scrapy/extensions/memusage.py | 1 -
scrapy/http/request/__init__.py | 3 +-
scrapy/http/request/form.py | 12 +-
scrapy/http/response/__init__.py | 30 +
scrapy/http/response/text.py | 56 ++
scrapy/linkextractors/__init__.py | 2 +-
scrapy/linkextractors/htmlparser.py | 8 +-
scrapy/linkextractors/lxmlhtml.py | 36 +-
scrapy/linkextractors/regex.py | 3 +-
scrapy/linkextractors/sgml.py | 28 +-
scrapy/logformatter.py | 10 +-
scrapy/pipelines/files.py | 4 +-
scrapy/pipelines/images.py | 5 +
scrapy/pipelines/media.py | 27 +-
scrapy/settings/default_settings.py | 24 +-
scrapy/spiderloader.py | 16 +
scrapy/spidermiddlewares/httperror.py | 4 +
scrapy/spidermiddlewares/referer.py | 343 +++++++-
scrapy/spiders/__init__.py | 18 +-
scrapy/spiders/crawl.py | 8 +-
scrapy/spiders/sitemap.py | 18 +-
.../templates/project/module/middlewares.py.tmpl | 8 +-
scrapy/templates/spiders/basic.tmpl | 4 +-
scrapy/utils/datatypes.py | 4 +-
scrapy/utils/deprecate.py | 32 +
scrapy/utils/gz.py | 4 +
scrapy/utils/log.py | 22 +-
scrapy/utils/misc.py | 2 +-
scrapy/utils/python.py | 11 +
scrapy/utils/reqser.py | 4 +-
scrapy/utils/response.py | 3 +-
scrapy/utils/url.py | 33 +-
setup.py | 2 +-
tests/__init__.py | 7 +-
tests/keys/cert.pem | 36 -
tests/keys/localhost.crt | 20 +
tests/keys/localhost.gen.README | 21 +
tests/keys/localhost.key | 28 +
tests/mockserver.py | 22 +-
tests/py3-ignores.txt | 7 -
tests/requirements-py3.txt | 1 +
tests/requirements.txt | 1 +
tests/sample_data/compressed/html-br.bin | Bin 0 -> 4027 bytes
.../link_extractor/sgml_linkextractor.html | 2 +
.../images/python-logo-master-v3-TM-flattened.png | Bin 0 -> 11155 bytes
.../files/images/python-powered-h-50x65.png | Bin 0 -> 3243 bytes
.../sample_data/test_site/files/images/scrapy.png | Bin 0 -> 2710 bytes
tests/spiders.py | 5 +-
tests/test_crawler.py | 46 ++
tests/test_downloader_handlers.py | 315 +++++++-
tests/test_downloadermiddleware_httpcompression.py | 101 ++-
tests/test_downloadermiddleware_httpproxy.py | 49 +-
tests/test_downloadermiddleware_retry.py | 93 ++-
tests/test_engine.py | 4 +-
tests/test_feedexport.py | 194 ++++-
tests/test_http_request.py | 21 +-
tests/test_http_response.py | 119 +++
tests/test_linkextractors.py | 41 +
tests/test_linkextractors_deprecated.py | 23 +-
tests/test_logformatter.py | 33 +
tests/test_pipeline_crawl.py | 182 +++++
tests/test_pipeline_images.py | 8 +
tests/test_pipeline_media.py | 68 +-
tests/test_proxy_connect.py | 4 +-
tests/test_spider.py | 33 +-
tests/test_spiderloader/__init__.py | 51 ++
tests/test_spidermiddleware_httperror.py | 13 +-
tests/test_spidermiddleware_referer.py | 869 ++++++++++++++++++++-
tests/test_spiderstate.py | 32 +-
tests/test_utils_datatypes.py | 48 +-
tests/test_utils_project.py | 5 +-
tests/test_utils_reqser.py | 4 +-
tests/test_utils_url.py | 169 +++-
tests/test_webclient.py | 21 +-
tox.ini | 3 +-
126 files changed, 4114 insertions(+), 512 deletions(-)
diff --cc debian/.git-dpm
index aaf173c,0000000..8343946
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 4179eb647d5367d7e790bf9b7175d2aa0e673cf0
- 4179eb647d5367d7e790bf9b7175d2aa0e673cf0
- e393c0a03fdd919e9ff3129345c7abd4724b7d1b
++283903b41a8d3767667b264c3939ddbce7f643e4
++283903b41a8d3767667b264c3939ddbce7f643e4
++f2dd115e9923fae44ed807f9a5435fafa6d26fdd
+f2dd115e9923fae44ed807f9a5435fafa6d26fdd
+python-scrapy_1.4.0.orig.tar.gz
+5e1edb9dfe128ce78cd413ca83a02f96ba57b6a2
+1114816
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
index 5cc47eb,0000000..2146175
mode 100644,000000..100644
--- a/debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
+++ b/debian/patches/0001-Skip-tests-with-unattainable-dependencies-in-Python3.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 4179eb647d5367d7e790bf9b7175d2aa0e673cf0 Mon Sep 17 00:00:00 2001
++From 283903b41a8d3767667b264c3939ddbce7f643e4 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Sat, 28 Jan 2017 20:50:33 +0100
+Subject: Skip tests with unattainable dependencies in Python3.
+
+Both libmproxy and sgmllib are not available for Python3. libmproxy might be in
+the future.
+---
+ tests/test_linkextractors_deprecated.py | 4 ++++
+ tests/test_proxy_connect.py | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/tests/test_linkextractors_deprecated.py b/tests/test_linkextractors_deprecated.py
- index 36dfe17..c45937b 100644
++index 1366971..ee8794c 100644
+--- a/tests/test_linkextractors_deprecated.py
++++ b/tests/test_linkextractors_deprecated.py
+@@ -1,5 +1,9 @@
+ # -*- coding: utf-8 -*-
+ import unittest
++
++import pytest
++pytest.importorskip('sgmllib')
++
+ from scrapy.linkextractors.regex import RegexLinkExtractor
+ from scrapy.http import HtmlResponse
+ from scrapy.link import Link
+diff --git a/tests/test_proxy_connect.py b/tests/test_proxy_connect.py
- index 0f06fd5..e0bf2c4 100644
++index 6213a51..7e44817 100644
+--- a/tests/test_proxy_connect.py
++++ b/tests/test_proxy_connect.py
+@@ -2,6 +2,9 @@ import json
+ import os
+ import time
+
++import pytest
++pytest.importorskip('libmproxy')
++
+ from threading import Thread
+ from libmproxy import controller, proxy
+ from netlib import http_auth
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-scrapy.git
More information about the Python-modules-commits
mailing list