[Python-modules-commits] [python-scrapy] 03/06: merge patched into master

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch master
in repository python-scrapy.

commit 533432cb4640e67eccb50de03e37d81464d0d218
Merge: 06b76f8 45edfb8
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Jul 10 23:17:39 2016 -0700

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0003-add-patch-to-support-sphinx-1.4.patch     | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/_ext/scrapydocs.py                            |  4 +-
 docs/topics/selectors.rst                          |  4 ++
 5 files changed, 60 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 8b05aee,0000000..0027827
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
- 52a1e66bcfd897d32f1742f6cea4fe8ec01da17c
- 52a1e66bcfd897d32f1742f6cea4fe8ec01da17c
++45edfb80aec1f8f81a15ea68ad22b9b01f34f36d
++45edfb80aec1f8f81a15ea68ad22b9b01f34f36d
 +ff33bf90fdefd8a8662560507ec187196cb314ac
 +ff33bf90fdefd8a8662560507ec187196cb314ac
 +python-scrapy_1.0.3.orig.tar.gz
 +a09b73f35f4e49c831d6fa08e47736e5bc016789
 +948924
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-add-patch-to-support-sphinx-1.4.patch
index 0000000,0000000..824a75b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-add-patch-to-support-sphinx-1.4.patch
@@@ -1,0 -1,0 +1,51 @@@
++From 45edfb80aec1f8f81a15ea68ad22b9b01f34f36d Mon Sep 17 00:00:00 2001
++From: Vincent Cheng <vcheng at debian.org>
++Date: Sun, 10 Jul 2016 23:17:26 -0700
++Subject: add patch to support sphinx 1.4
++
++---
++ docs/_ext/scrapydocs.py   | 4 ++--
++ docs/topics/selectors.rst | 4 ++++
++ 2 files changed, 6 insertions(+), 2 deletions(-)
++
++diff --git a/docs/_ext/scrapydocs.py b/docs/_ext/scrapydocs.py
++index f0827f2..83b0d2c 100644
++--- a/docs/_ext/scrapydocs.py
+++++ b/docs/_ext/scrapydocs.py
++@@ -18,7 +18,7 @@ def is_setting_index(node):
++     if node.tagname == 'index':
++         # index entries for setting directives look like:
++         # [(u'pair', u'SETTING_NAME; setting', u'std:setting-SETTING_NAME', '')]
++-        entry_type, info, refid, _ = node['entries'][0]
+++        entry_type, info, refid = node['entries'][0][:3]
++         return entry_type == 'pair' and info.endswith('; setting')
++     return False
++ 
++@@ -30,7 +30,7 @@ def get_setting_target(node):
++ 
++ def get_setting_name_and_refid(node):
++     """Extract setting name from directive index node"""
++-    entry_type, info, refid, _ = node['entries'][0]
+++    entry_type, info, refid = node['entries'][0][:3]
++     return info.replace('; setting', ''), refid
++ 
++ 
++diff --git a/docs/topics/selectors.rst b/docs/topics/selectors.rst
++index 688c2b7..12415d0 100644
++--- a/docs/topics/selectors.rst
+++++ b/docs/topics/selectors.rst
++@@ -738,10 +738,14 @@ simple/convenient XPaths. You can use the
++ 
++ Let's show an example that illustrates this with Github blog atom feed.
++ 
+++.. highlight:: sh
+++
++ First, we open the shell with the url we want to scrape::
++ 
++     $ scrapy shell https://github.com/blog.atom
++ 
+++.. highlight:: python
+++
++ Once in the shell we can try selecting all ``<link>`` objects and see that it
++ doesn't work (because the Atom XML namespace is obfuscating those nodes)::
++ 
diff --cc debian/patches/series
index 3f616b7,0000000..da414c0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +changeset_48582be.diff
 +changeset_49fe915.diff
++0003-add-patch-to-support-sphinx-1.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-scrapy.git