[planet-web/solar: 1317/1318] Merge branch 'venus' into solar



commit ab02040c5062867bc600c47ae3420894104aeb55
Merge: c37b151 35b4436
Author: Andy Wingo <wingo pobox com>
Date:   Wed May 16 18:04:28 2012 +0200

    Merge branch 'venus' into solar

 .gitignore                                         |    5 +
 AUTHORS                                            |    7 +
 LICENCE                                            |   84 +
 README                                             |   20 +
 THANKS                                             |   41 +
 TODO                                               |    7 +
 admin_cb.py                                        |  141 +
 docs/admin.html                                    |   78 +
 docs/config.html                                   |  177 +
 docs/contributing.html                             |   65 +
 docs/docs.css                                      |  100 +
 docs/docs.js                                       |   54 +
 docs/etiquette.html                                |   48 +
 docs/filters.html                                  |  105 +
 docs/img/shadowAlpha.png                           |  Bin 0 -> 3403 bytes
 docs/index.html                                    |   56 +
 docs/installation.html                             |  129 +
 docs/migration.html                                |   42 +
 docs/normalization.html                            |  107 +
 docs/templates.html                                |  190 +
 docs/venus.svg                                     |  109 +
 examples/filters/categories/categories.xslt        |   82 +
 examples/filters/guess-language/README             |   37 +
 examples/filters/guess-language/en.data            |15131 +++++++++++++
 examples/filters/guess-language/fr.data            |22710 ++++++++++++++++++++
 examples/filters/guess-language/guess-language.py  |   58 +
 examples/filters/guess-language/learn-language.py  |   25 +
 examples/filters/guess-language/trigram.py         |  188 +
 examples/filters/xpath-sifter/xpath-sifter.ini     |   55 +
 examples/foaf-based.ini                            |   44 +
 examples/images/edd.png                            |  Bin 0 -> 9918 bytes
 examples/images/jdub.png                           |  Bin 0 -> 9814 bytes
 examples/images/keybuk.png                         |  Bin 0 -> 8496 bytes
 examples/images/thom.png                           |  Bin 0 -> 7257 bytes
 examples/opml-top100.ini                           |   57 +
 examples/planet-schmanet.ini                       |   78 +
 expunge.py                                         |   17 +
 favicon.py                                         |   79 +
 filters/addsearch.genshi                           |   30 +
 filters/addsearch.xslt                             |   70 +
 filters/coral_cdn_filter.py                        |   18 +
 filters/delDupName/byline_author.xslt              |   29 +
 filters/delDupName/p_by_name.xslt                  |   17 +
 filters/delDupName/p_from.xslt                     |   15 +
 filters/detitle.xslt                               |   25 +
 filters/excerpt.py                                 |  109 +
 filters/h1title.xslt                               |   30 +
 filters/html2xhtml.plugin                          |    6 +
 filters/mememe.plugin                              |  508 +
 filters/minhead.py                                 |   36 +
 filters/notweets.py                                |    6 +
 filters/regexp_sifter.py                           |   44 +
 filters/stripAd/feedburner.sed                     |    1 +
 filters/stripAd/google_ad_map.sed                  |    1 +
 filters/stripAd/yahoo.sed                          |    1 +
 filters/xhtml2html.plugin                          |   31 +
 filters/xpath_sifter.py                            |   23 +
 planet.py                                          |   97 +
 planet/__init__.py                                 |   42 +
 planet/config.py                                   |  413 +
 planet/csv_config.py                               |   30 +
 planet/expunge.py                                  |   67 +
 planet/foaf.py                                     |  197 +
 planet/idindex.py                                  |   99 +
 planet/opml.py                                     |  154 +
 planet/publish.py                                  |   26 +
 planet/reconstitute.py                             |  370 +
 planet/scrub.py                                    |  151 +
 planet/shell/__init__.py                           |   67 +
 planet/shell/_genshi.py                            |  147 +
 planet/shell/dj.py                                 |   51 +
 planet/shell/plugin.py                             |   64 +
 planet/shell/py.py                                 |   22 +
 planet/shell/sed.py                                |   19 +
 planet/shell/tmpl.py                               |  276 +
 planet/shell/xslt.py                               |   78 +
 planet/spider.py                                   |  496 +
 planet/splice.py                                   |  191 +
 planet/vendor/compat_logging/__init__.py           | 1196 +
 planet/vendor/compat_logging/config.py             |  299 +
 planet/vendor/compat_logging/handlers.py           |  728 +
 planet/vendor/feedparser.py                        | 3689 ++++
 planet/vendor/html5lib/__init__.py                 |   17 +
 planet/vendor/html5lib/constants.py                | 1171 +
 planet/vendor/html5lib/filters/_base.py            |   10 +
 planet/vendor/html5lib/filters/formfiller.py       |  127 +
 .../vendor/html5lib/filters/inject_meta_charset.py |   63 +
 planet/vendor/html5lib/filters/lint.py             |   88 +
 planet/vendor/html5lib/filters/optionaltags.py     |  202 +
 planet/vendor/html5lib/filters/sanitizer.py        |    8 +
 planet/vendor/html5lib/filters/whitespace.py       |   41 +
 planet/vendor/html5lib/html5parser.py              | 2637 +++
 planet/vendor/html5lib/ihatexml.py                 |  177 +
 planet/vendor/html5lib/inputstream.py              |  789 +
 planet/vendor/html5lib/sanitizer.py                |  258 +
 planet/vendor/html5lib/serializer/__init__.py      |   17 +
 .../vendor/html5lib/serializer/htmlserializer.py   |  266 +
 .../vendor/html5lib/serializer/xhtmlserializer.py  |    9 +
 planet/vendor/html5lib/tokenizer.py                | 1586 ++
 planet/vendor/html5lib/treebuilders/__init__.py    |   94 +
 planet/vendor/html5lib/treebuilders/_base.py       |  345 +
 planet/vendor/html5lib/treebuilders/dom.py         |  286 +
 planet/vendor/html5lib/treebuilders/etree.py       |  333 +
 planet/vendor/html5lib/treebuilders/etree_lxml.py  |  335 +
 planet/vendor/html5lib/treebuilders/simpletree.py  |  248 +
 planet/vendor/html5lib/treebuilders/soup.py        |  228 +
 planet/vendor/html5lib/treewalkers/__init__.py     |   52 +
 planet/vendor/html5lib/treewalkers/_base.py        |  172 +
 planet/vendor/html5lib/treewalkers/dom.py          |   37 +
 planet/vendor/html5lib/treewalkers/etree.py        |  130 +
 planet/vendor/html5lib/treewalkers/genshistream.py |   70 +
 planet/vendor/html5lib/treewalkers/lxmletree.py    |  181 +
 planet/vendor/html5lib/treewalkers/pulldom.py      |   56 +
 planet/vendor/html5lib/treewalkers/simpletree.py   |   72 +
 planet/vendor/html5lib/treewalkers/soup.py         |   60 +
 planet/vendor/html5lib/utils.py                    |  175 +
 planet/vendor/htmltmpl.py                          | 1421 ++
 planet/vendor/httplib2/__init__.py                 | 1175 +
 planet/vendor/httplib2/iri2uri.py                  |  110 +
 planet/vendor/portalocker.py                       |   93 +
 planet/vendor/pubsubhubbub_publisher/PKG-INFO      |   10 +
 planet/vendor/pubsubhubbub_publisher/__init__.py   |    2 +
 .../pubsubhubbub_publisher/pubsubhubbub_publish.py |   77 +
 planet/vendor/timeoutsocket.py                     |  424 +
 publish.py                                         |   17 +
 runtests.py                                        |   48 +
 spider.py                                          |   22 +
 splice.py                                          |   18 +
 tests/capture.py                                   |   57 +
 tests/data/apply/config-asf.ini                    |   17 +
 tests/data/apply/config-fancy.ini                  |   21 +
 tests/data/apply/config-filter.ini                 |   21 +
 tests/data/apply/config-genshi.ini                 |   21 +
 tests/data/apply/config-html.ini                   |   25 +
 tests/data/apply/config-mememe.ini                 |   29 +
 tests/data/apply/feed.xml                          |    2 +
 tests/data/apply/images/jdub.png                   |  Bin 0 -> 9814 bytes
 tests/data/apply/rebase.py                         |   24 +
 tests/data/config/another.foaf                     |   38 +
 tests/data/config/basic.csv                        |    5 +
 tests/data/config/basic.ini                        |   18 +
 tests/data/config/eliast.foaf                      |   55 +
 tests/data/config/foaf-deep.ini                    |   11 +
 tests/data/config/foaf-multiple.ini                |   18 +
 tests/data/config/foaf.ini                         |    9 +
 tests/data/config/ldf-card.foaf                    |   33 +
 tests/data/config/opml.xml                         |   15 +
 tests/data/config/rlist-config.ini                 |    7 +
 tests/data/config/rlist-csv.ini                    |    7 +
 tests/data/config/rlist.ini                        |    6 +
 tests/data/config/rubys-card.foaf                  |   33 +
 tests/data/config/subconfig.ini                    |    6 +
 tests/data/config/themed.ini                       |   14 +
 tests/data/expunge/config.ini                      |   20 +
 tests/data/expunge/test1.entry                     |    8 +
 tests/data/expunge/test2.entry                     |   11 +
 tests/data/expunge/test3a.entry                    |   12 +
 tests/data/expunge/test3b.entry                    |   12 +
 tests/data/expunge/test3c.entry                    |   12 +
 tests/data/expunge/test4a.entry                    |   12 +
 tests/data/expunge/test4b.entry                    |   12 +
 tests/data/expunge/test4c.entry                    |   12 +
 tests/data/expunge/test5.entry                     |   12 +
 tests/data/expunge/testfeed1.atom                  |    5 +
 tests/data/expunge/testfeed2.atom                  |    5 +
 tests/data/expunge/testfeed3.atom                  |    5 +
 tests/data/expunge/testfeed4.atom                  |    5 +
 tests/data/filter/category-one.xml                 |    3 +
 tests/data/filter/category-two.xml                 |    3 +
 tests/data/filter/coral_cdn.xml                    |   10 +
 tests/data/filter/django/config.html.dj            |    1 +
 tests/data/filter/django/test.ini                  |    2 +
 tests/data/filter/django/test.xml                  |   20 +
 tests/data/filter/django/title.html.dj             |    1 +
 tests/data/filter/excerpt-images.ini               |    5 +
 tests/data/filter/excerpt-images.xml               |   10 +
 tests/data/filter/excerpt-images2.ini              |    2 +
 tests/data/filter/excerpt-lorem-ipsum.ini          |    7 +
 tests/data/filter/excerpt-lorem-ipsum.xml          |    8 +
 tests/data/filter/index.html                       |   18 +
 tests/data/filter/minhead.ini                      |    3 +
 tests/data/filter/minhead.xml                      |    3 +
 tests/data/filter/regexp-sifter.ini                |    2 +
 tests/data/filter/regexp-sifter2.ini               |    2 +
 tests/data/filter/stripAd-yahoo.ini                |    2 +
 tests/data/filter/stripAd-yahoo.xml                |    4 +
 tests/data/filter/tmpl/author_email.xml            |   13 +
 tests/data/filter/tmpl/author_name.xml             |   13 +
 tests/data/filter/tmpl/author_uri.xml              |   13 +
 tests/data/filter/tmpl/content_html.xml            |   10 +
 tests/data/filter/tmpl/content_lang.xml            |   10 +
 tests/data/filter/tmpl/content_text.xml            |   10 +
 tests/data/filter/tmpl/content_xhtml.xml           |   13 +
 tests/data/filter/tmpl/content_xhtml2.xml          |   13 +
 tests/data/filter/tmpl/enclosure_href.xml          |   11 +
 tests/data/filter/tmpl/enclosure_length.xml        |   11 +
 tests/data/filter/tmpl/enclosure_type.xml          |   11 +
 tests/data/filter/tmpl/feed_feed.ini               |    7 +
 tests/data/filter/tmpl/feed_generator.ini          |    7 +
 tests/data/filter/tmpl/feed_link.ini               |    7 +
 tests/data/filter/tmpl/feed_name.ini               |    7 +
 tests/data/filter/tmpl/feed_owner_email.ini        |    7 +
 tests/data/filter/tmpl/feed_owner_name.ini         |    7 +
 tests/data/filter/tmpl/id.xml                      |   11 +
 tests/data/filter/tmpl/id_only_content.xml         |   13 +
 tests/data/filter/tmpl/id_only_description.xml     |   13 +
 tests/data/filter/tmpl/id_only_link.xml            |   13 +
 tests/data/filter/tmpl/id_only_title.xml           |   13 +
 tests/data/filter/tmpl/link_href.xml               |   11 +
 tests/data/filter/tmpl/link_rel.xml                |   11 +
 tests/data/filter/tmpl/link_type.xml               |   11 +
 tests/data/filter/tmpl/new_channel.xml             |   34 +
 tests/data/filter/tmpl/new_channel_date.xml        |   35 +
 tests/data/filter/tmpl/new_date.xml                |   23 +
 tests/data/filter/tmpl/planet_name.xml             |   16 +
 tests/data/filter/tmpl/planet_title_name.xml       |   13 +
 tests/data/filter/tmpl/published.xml               |   11 +
 tests/data/filter/tmpl/rights.xml                  |   11 +
 tests/data/filter/tmpl/source_author.xml           |   20 +
 tests/data/filter/tmpl/source_icon.xml             |   16 +
 tests/data/filter/tmpl/source_id.xml               |   16 +
 tests/data/filter/tmpl/source_link.xml             |   16 +
 tests/data/filter/tmpl/source_logo.xml             |   16 +
 tests/data/filter/tmpl/source_planet_message.xml   |   16 +
 tests/data/filter/tmpl/source_planet_name.xml      |   16 +
 tests/data/filter/tmpl/source_rights.xml           |   16 +
 tests/data/filter/tmpl/source_subtitle.xml         |   16 +
 tests/data/filter/tmpl/source_title.xml            |   16 +
 tests/data/filter/tmpl/source_updated.xml          |   16 +
 tests/data/filter/tmpl/summary_html.xml            |   10 +
 tests/data/filter/tmpl/summary_lang.xml            |   10 +
 tests/data/filter/tmpl/summary_text.xml            |   10 +
 tests/data/filter/tmpl/summary_xhtml.xml           |   13 +
 tests/data/filter/tmpl/title_html.xml              |   10 +
 tests/data/filter/tmpl/title_lang.xml              |   10 +
 tests/data/filter/tmpl/title_text.xml              |   10 +
 tests/data/filter/tmpl/title_xhtml.xml             |   13 +
 tests/data/filter/tmpl/updated.xml                 |   11 +
 tests/data/filter/translate.ini                    |    7 +
 tests/data/filter/translate.xslt                   |   20 +
 tests/data/filter/xpath-sifter.ini                 |    6 +
 tests/data/filter/xpath-sifter2.ini                |    2 +
 tests/data/reconstitute.xslt                       |   40 +
 tests/data/reconstitute/author_email.xml           |   13 +
 tests/data/reconstitute/author_name.xml            |   13 +
 tests/data/reconstitute/author_noname.xml          |   13 +
 tests/data/reconstitute/author_uri.xml             |   13 +
 tests/data/reconstitute/category_blank_term.xml    |   11 +
 tests/data/reconstitute/category_label.xml         |   11 +
 tests/data/reconstitute/category_scheme.xml        |   11 +
 tests/data/reconstitute/category_term.xml          |   11 +
 tests/data/reconstitute/cc_license.xml             |   13 +
 tests/data/reconstitute/content_html.xml           |   10 +
 tests/data/reconstitute/content_illegal_char.xml   |   10 +
 tests/data/reconstitute/content_lang.xml           |   10 +
 tests/data/reconstitute/content_tag_soup.xml       |   10 +
 tests/data/reconstitute/content_text.xml           |   10 +
 tests/data/reconstitute/content_xhtml.xml          |   13 +
 tests/data/reconstitute/contributor_email.xml      |   13 +
 tests/data/reconstitute/contributor_name.xml       |   13 +
 tests/data/reconstitute/contributor_uri.xml        |   13 +
 .../data/reconstitute/creativeCommons_license.xml  |   13 +
 tests/data/reconstitute/dc_date_taken.xml          |   12 +
 tests/data/reconstitute/dc_lang.xml                |   14 +
 tests/data/reconstitute/empty_title.xml            |   10 +
 tests/data/reconstitute/enclosure.xml              |   13 +
 tests/data/reconstitute/feedburner_origlink.xml    |   12 +
 tests/data/reconstitute/geo_latlong.xml            |   13 +
 tests/data/reconstitute/georss_box_latlong.xml     |   10 +
 .../georss_placeboxpolygon_latlong.xml             |   15 +
 tests/data/reconstitute/georss_point_latlong.xml   |   11 +
 tests/data/reconstitute/georss_polygon_latlong.xml |   10 +
 tests/data/reconstitute/gr_id.xml                  |   11 +
 tests/data/reconstitute/id.xml                     |   11 +
 tests/data/reconstitute/id_only_content.xml        |   13 +
 tests/data/reconstitute/id_only_description.xml    |   13 +
 tests/data/reconstitute/id_only_link.xml           |   13 +
 tests/data/reconstitute/id_only_title.xml          |   13 +
 tests/data/reconstitute/link_href.xml              |   11 +
 tests/data/reconstitute/link_length.xml            |   11 +
 tests/data/reconstitute/link_rel.xml               |   11 +
 tests/data/reconstitute/link_type.xml              |   11 +
 tests/data/reconstitute/missing_item_pubDate.xml   |   14 +
 tests/data/reconstitute/missing_title.xml          |    9 +
 tests/data/reconstitute/onlyguid.xml               |   13 +
 tests/data/reconstitute/planet_name.xml            |   11 +
 tests/data/reconstitute/planet_name_source.xml     |   15 +
 tests/data/reconstitute/published.xml              |   11 +
 tests/data/reconstitute/rights.xml                 |   11 +
 tests/data/reconstitute/rss_image.xml              |   12 +
 tests/data/reconstitute/rss_lang.xml               |   14 +
 tests/data/reconstitute/rss_source.xml             |   15 +
 tests/data/reconstitute/source_author.xml          |   12 +
 tests/data/reconstitute/source_bozo.xml            |    8 +
 tests/data/reconstitute/source_category.xml        |   14 +
 tests/data/reconstitute/source_contributor.xml     |   12 +
 tests/data/reconstitute/source_format.xml          |    8 +
 tests/data/reconstitute/source_icon.xml            |   10 +
 tests/data/reconstitute/source_id.xml              |   10 +
 tests/data/reconstitute/source_link.xml            |   11 +
 tests/data/reconstitute/source_logo.xml            |   10 +
 tests/data/reconstitute/source_planet_id.xml       |   14 +
 tests/data/reconstitute/source_rights.xml          |   10 +
 tests/data/reconstitute/source_subtitle.xml        |   10 +
 tests/data/reconstitute/source_title.xml           |   10 +
 tests/data/reconstitute/source_updated.xml         |   10 +
 tests/data/reconstitute/stack_overflow.xml         |   36 +
 tests/data/reconstitute/summary_html.xml           |   10 +
 tests/data/reconstitute/summary_lang.xml           |   10 +
 tests/data/reconstitute/summary_text.xml           |   10 +
 tests/data/reconstitute/summary_xhtml.xml          |   13 +
 tests/data/reconstitute/title_html.xml             |   10 +
 tests/data/reconstitute/title_lang.xml             |   10 +
 tests/data/reconstitute/title_text.xml             |   10 +
 tests/data/reconstitute/title_xhtml.xml            |   13 +
 tests/data/reconstitute/updated.xml                |   11 +
 tests/data/spider/config.ini                       |   16 +
 tests/data/spider/testfeed1a.atom                  |   49 +
 tests/data/spider/testfeed1b.atom                  |   50 +
 tests/data/spider/testfeed2.atom                   |   49 +
 tests/data/spider/testfeed3.rss                    |   37 +
 tests/data/spider/testfeed4.atom                   |   41 +
 tests/data/spider/threaded.ini                     |   19 +
 tests/data/splice/cache/example.com,3              |    2 +
 tests/data/splice/cache/example.com,4              |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed1,1 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed1,2 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed1,3 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed1,4 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed2,1 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed2,2 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed2,3 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed2,4 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed3,1 |    2 +
 .../cache/planet.intertwingly.net,2006,testfeed3,2 |    2 +
 .../cache/sources/tests,data,spider,testfeed0.atom |    2 +
 .../sources/tests,data,spider,testfeed1b.atom      |    2 +
 .../cache/sources/tests,data,spider,testfeed2.atom |    2 +
 .../cache/sources/tests,data,spider,testfeed3.rss  |    2 +
 tests/data/splice/config.ini                       |   15 +
 tests/reconstitute.py                              |   88 +
 tests/test_apply.py                                |  135 +
 tests/test_config.py                               |   71 +
 tests/test_config_csv.py                           |   25 +
 tests/test_docs.py                                 |   31 +
 tests/test_expunge.py                              |   84 +
 tests/test_filter_django.py                        |   53 +
 tests/test_filter_genshi.py                        |   22 +
 tests/test_filter_tmpl.py                          |   67 +
 tests/test_filter_xslt.py                          |   44 +
 tests/test_filters.py                              |  189 +
 tests/test_foaf.py                                 |  127 +
 tests/test_idindex.py                              |   74 +
 tests/test_opml.py                                 |  177 +
 tests/test_reconstitute.py                         |   45 +
 tests/test_rlists.py                               |   49 +
 tests/test_scrub.py                                |  124 +
 tests/test_spider.py                               |  183 +
 tests/test_splice.py                               |   34 +
 tests/test_subconfig.py                            |    8 +
 tests/test_themes.py                               |   59 +
 themes/asf/config.ini                              |   21 +
 themes/asf/default.css                             |  538 +
 themes/asf/index.html.xslt                         |  345 +
 themes/asf/personalize.js                          |  301 +
 themes/classic_fancy/config.ini                    |   20 +
 themes/classic_fancy/index.html.tmpl               |  126 +
 themes/classic_fancy/planet.css                    |  150 +
 themes/common/admin.html.tmpl                      |   41 +
 themes/common/atom.xml.xslt                        |   80 +
 themes/common/foafroll.xml.xslt                    |   39 +
 themes/common/images/feed-icon-10x10.png           |  Bin 0 -> 469 bytes
 themes/common/images/foaf.png                      |  Bin 0 -> 1393 bytes
 themes/common/images/logo.png                      |  Bin 0 -> 5413 bytes
 themes/common/images/opml.png                      |  Bin 0 -> 804 bytes
 themes/common/images/planet.png                    |  Bin 0 -> 426 bytes
 themes/common/images/tcosm11.gif                   |  Bin 0 -> 203 bytes
 themes/common/images/venus.ico                     |  Bin 0 -> 894 bytes
 themes/common/images/venus.png                     |  Bin 0 -> 570 bytes
 themes/common/opml.xml.xslt                        |   40 +
 themes/common/rss10.xml.tmpl                       |   44 +
 themes/common/rss20.xml.tmpl                       |   39 +
 themes/common/validate.html.xslt                   |  146 +
 themes/django/bland.css                            |   39 +
 themes/django/config.ini                           |   11 +
 themes/django/index.html.dj                        |   49 +
 themes/genshi_fancy/config.ini                     |   20 +
 themes/genshi_fancy/index.html.genshi              |   95 +
 themes/genshi_fancy/planet.css                     |  150 +
 themes/mobile/config.ini                           |   24 +
 themes/mobile/mobile.html.xslt                     |  199 +
 themes/musings/config.ini                          |   18 +
 themes/musings/default.css                         |  402 +
 themes/musings/index.html.xslt                     |  293 +
 themes/musings/personalize.js                      |  220 +
 395 files changed, 71670 insertions(+), 0 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]