[Python-modules-commits] [feedgenerator] 01/02: Import feedgenerator_1.9.orig.tar.gz
Vincent Cheng
vcheng at moszumanska.debian.org
Mon Sep 19 03:33:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
vcheng pushed a commit to branch master
in repository feedgenerator.
commit d679eddc64d7972ef0cbf0a72090572df621e6e4
Author: Vincent Cheng <vcheng at debian.org>
Date: Sun Sep 18 20:32:30 2016 -0700
Import feedgenerator_1.9.orig.tar.gz
---
.../feedgenerator/django/utils/feedgenerator.py | 13 ++++++++++---
.../feedgenerator/django/utils/feedgenerator.py | 13 ++++++++++---
.../feedgenerator/django/utils/feedgenerator.py | 13 ++++++++++---
PKG-INFO | 6 +++---
feedgenerator.egg-info/PKG-INFO | 6 +++---
feedgenerator/django/utils/feedgenerator.py | 13 ++++++++++---
setup.py | 12 ++++++------
.../__pycache__/test_feedgenerator.cpython-35.pyc | Bin 4475 -> 4617 bytes
tests_feedgenerator/test_feedgenerator.py | 21 +++++++++------------
tests_feedgenerator/test_feedgenerator.pyc | Bin 5074 -> 5205 bytes
10 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/.tox/py26/lib/python2.6/site-packages/feedgenerator/django/utils/feedgenerator.py b/.tox/py26/lib/python2.6/site-packages/feedgenerator/django/utils/feedgenerator.py
index 04b7d73..0da6ab1 100644
--- a/.tox/py26/lib/python2.6/site-packages/feedgenerator/django/utils/feedgenerator.py
+++ b/.tox/py26/lib/python2.6/site-packages/feedgenerator/django/utils/feedgenerator.py
@@ -36,7 +36,7 @@ from .six import StringIO
from .timezone import is_aware
def rfc2822_date(date):
- # We can't use strftime() because it produces locale-dependant results, so
+ # We can't use strftime() because it produces locale-dependent results, so
# we have to map english month and day names manually
months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)
days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
@@ -80,7 +80,10 @@ def get_tag_uri(url, date):
d = ''
if date is not None:
d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
- return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
+ fragment = ''
+ if bits.fragment != '':
+ fragment = '/%s' % (bits.fragment)
+ return 'tag:%s%s:%s%s' % (bits.hostname, d, bits.path, fragment)
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
@@ -346,10 +349,14 @@ class Atom1Feed(SyndicationFeed):
def add_item_elements(self, handler, item):
handler.addQuickElement("title", item['title'])
handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
+
+ updateddate = datetime.datetime.now()
if item['pubdate'] is not None:
handler.addQuickElement("published", rfc3339_date(item['pubdate']))
+ updateddate = item['pubdate']
if item['updateddate'] is not None:
- handler.addQuickElement("updated", rfc3339_date(item['updateddate']))
+ updateddate = item['updateddate']
+ handler.addQuickElement("updated", rfc3339_date(updateddate))
# Author information.
if item['author_name'] is not None:
diff --git a/.tox/py27/lib/python2.7/site-packages/feedgenerator/django/utils/feedgenerator.py b/.tox/py27/lib/python2.7/site-packages/feedgenerator/django/utils/feedgenerator.py
index 04b7d73..0da6ab1 100644
--- a/.tox/py27/lib/python2.7/site-packages/feedgenerator/django/utils/feedgenerator.py
+++ b/.tox/py27/lib/python2.7/site-packages/feedgenerator/django/utils/feedgenerator.py
@@ -36,7 +36,7 @@ from .six import StringIO
from .timezone import is_aware
def rfc2822_date(date):
- # We can't use strftime() because it produces locale-dependant results, so
+ # We can't use strftime() because it produces locale-dependent results, so
# we have to map english month and day names manually
months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)
days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
@@ -80,7 +80,10 @@ def get_tag_uri(url, date):
d = ''
if date is not None:
d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
- return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
+ fragment = ''
+ if bits.fragment != '':
+ fragment = '/%s' % (bits.fragment)
+ return 'tag:%s%s:%s%s' % (bits.hostname, d, bits.path, fragment)
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
@@ -346,10 +349,14 @@ class Atom1Feed(SyndicationFeed):
def add_item_elements(self, handler, item):
handler.addQuickElement("title", item['title'])
handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
+
+ updateddate = datetime.datetime.now()
if item['pubdate'] is not None:
handler.addQuickElement("published", rfc3339_date(item['pubdate']))
+ updateddate = item['pubdate']
if item['updateddate'] is not None:
- handler.addQuickElement("updated", rfc3339_date(item['updateddate']))
+ updateddate = item['updateddate']
+ handler.addQuickElement("updated", rfc3339_date(updateddate))
# Author information.
if item['author_name'] is not None:
diff --git a/.tox/py35/lib/python3.5/site-packages/feedgenerator/django/utils/feedgenerator.py b/.tox/py35/lib/python3.5/site-packages/feedgenerator/django/utils/feedgenerator.py
index 04b7d73..0da6ab1 100644
--- a/.tox/py35/lib/python3.5/site-packages/feedgenerator/django/utils/feedgenerator.py
+++ b/.tox/py35/lib/python3.5/site-packages/feedgenerator/django/utils/feedgenerator.py
@@ -36,7 +36,7 @@ from .six import StringIO
from .timezone import is_aware
def rfc2822_date(date):
- # We can't use strftime() because it produces locale-dependant results, so
+ # We can't use strftime() because it produces locale-dependent results, so
# we have to map english month and day names manually
months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)
days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
@@ -80,7 +80,10 @@ def get_tag_uri(url, date):
d = ''
if date is not None:
d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
- return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
+ fragment = ''
+ if bits.fragment != '':
+ fragment = '/%s' % (bits.fragment)
+ return 'tag:%s%s:%s%s' % (bits.hostname, d, bits.path, fragment)
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
@@ -346,10 +349,14 @@ class Atom1Feed(SyndicationFeed):
def add_item_elements(self, handler, item):
handler.addQuickElement("title", item['title'])
handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
+
+ updateddate = datetime.datetime.now()
if item['pubdate'] is not None:
handler.addQuickElement("published", rfc3339_date(item['pubdate']))
+ updateddate = item['pubdate']
if item['updateddate'] is not None:
- handler.addQuickElement("updated", rfc3339_date(item['updateddate']))
+ updateddate = item['updateddate']
+ handler.addQuickElement("updated", rfc3339_date(updateddate))
# Author information.
if item['author_name'] is not None:
diff --git a/PKG-INFO b/PKG-INFO
index 224af68..8214462 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: feedgenerator
-Version: 1.8
+Version: 1.9
Summary: Standalone version of django.utils.feedgenerator
Home-page: https://github.com/getpelican/feedgenerator
-Author: Dirk Makowski
-Author-email: dm at parenchym.com
+Author: Pelican Dev Team
+Author-email: authors at getpelican.com
License: UNKNOWN
Description: FeedGenerator
=============
diff --git a/feedgenerator.egg-info/PKG-INFO b/feedgenerator.egg-info/PKG-INFO
index 224af68..8214462 100644
--- a/feedgenerator.egg-info/PKG-INFO
+++ b/feedgenerator.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
Metadata-Version: 1.1
Name: feedgenerator
-Version: 1.8
+Version: 1.9
Summary: Standalone version of django.utils.feedgenerator
Home-page: https://github.com/getpelican/feedgenerator
-Author: Dirk Makowski
-Author-email: dm at parenchym.com
+Author: Pelican Dev Team
+Author-email: authors at getpelican.com
License: UNKNOWN
Description: FeedGenerator
=============
diff --git a/feedgenerator/django/utils/feedgenerator.py b/feedgenerator/django/utils/feedgenerator.py
index 04b7d73..0da6ab1 100644
--- a/feedgenerator/django/utils/feedgenerator.py
+++ b/feedgenerator/django/utils/feedgenerator.py
@@ -36,7 +36,7 @@ from .six import StringIO
from .timezone import is_aware
def rfc2822_date(date):
- # We can't use strftime() because it produces locale-dependant results, so
+ # We can't use strftime() because it produces locale-dependent results, so
# we have to map english month and day names manually
months = ('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',)
days = ('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')
@@ -80,7 +80,10 @@ def get_tag_uri(url, date):
d = ''
if date is not None:
d = ',%s' % datetime_safe.new_datetime(date).strftime('%Y-%m-%d')
- return 'tag:%s%s:%s/%s' % (bits.hostname, d, bits.path, bits.fragment)
+ fragment = ''
+ if bits.fragment != '':
+ fragment = '/%s' % (bits.fragment)
+ return 'tag:%s%s:%s%s' % (bits.hostname, d, bits.path, fragment)
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
@@ -346,10 +349,14 @@ class Atom1Feed(SyndicationFeed):
def add_item_elements(self, handler, item):
handler.addQuickElement("title", item['title'])
handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
+
+ updateddate = datetime.datetime.now()
if item['pubdate'] is not None:
handler.addQuickElement("published", rfc3339_date(item['pubdate']))
+ updateddate = item['pubdate']
if item['updateddate'] is not None:
- handler.addQuickElement("updated", rfc3339_date(item['updateddate']))
+ updateddate = item['updateddate']
+ handler.addQuickElement("updated", rfc3339_date(updateddate))
# Author information.
if item['author_name'] is not None:
diff --git a/setup.py b/setup.py
index 8b5fad9..188d9a6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python
# Using setuptools rather than distutils to get the `develop` command
from setuptools import setup
@@ -6,7 +6,7 @@ from setuptools import setup
NAME = 'feedgenerator'
PACKAGES = ['feedgenerator', 'feedgenerator.django',
- 'feedgenerator.django.utils']
+ 'feedgenerator.django.utils']
DESCRIPTION = 'Standalone version of django.utils.feedgenerator'
LONG_DESCRIPTION = open('README.rst').read()
@@ -26,14 +26,14 @@ CLASSIFIERS = ['Development Status :: 3 - Alpha',
'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules',
-]
+ ]
AUTHOR = 'Django Software Foundation'
AUTHOR_EMAIL = 'foundation at djangoproject.com'
-MAINTAINER = 'Dirk Makowski'
-MAINTAINER_EMAIL = 'dm at parenchym.com'
+MAINTAINER = 'Pelican Dev Team'
+MAINTAINER_EMAIL = 'authors at getpelican.com'
KEYWORDS = "feed atom rss".split(' ')
-VERSION = '1.8'
+VERSION = '1.9'
TEST_SUITE = 'tests_feedgenerator'
diff --git a/tests_feedgenerator/__pycache__/test_feedgenerator.cpython-35.pyc b/tests_feedgenerator/__pycache__/test_feedgenerator.cpython-35.pyc
index 90ad7a3..b4bdf4b 100644
Binary files a/tests_feedgenerator/__pycache__/test_feedgenerator.cpython-35.pyc and b/tests_feedgenerator/__pycache__/test_feedgenerator.cpython-35.pyc differ
diff --git a/tests_feedgenerator/test_feedgenerator.py b/tests_feedgenerator/test_feedgenerator.py
index 45c64cd..2dfdebc 100644
--- a/tests_feedgenerator/test_feedgenerator.py
+++ b/tests_feedgenerator/test_feedgenerator.py
@@ -8,6 +8,7 @@ except ImportError:
import unittest
import six
+import datetime
import feedgenerator
@@ -26,6 +27,7 @@ FIXT_ITEM = dict(
link="http://www.holovaty.com/test/",
description="Testing.",
content="Full content of our testing entry.",
+ pubdate=datetime.datetime(2016,8,11,0,0,0,0),
)
@@ -34,10 +36,10 @@ EXPECTED_RESULT_RSS = """<?xml version="1.0" encoding="utf-8"?>
Umlauts: äöüßÄÖÜ
Chinese: 老师是四十四，是不是？
Finnish: Mustan kissan paksut posket. (ah, no special chars) Kärpänen sanoi kärpäselle: tuu kattoon kattoon ku kaveri tapettiin tapettiin.
- </description><language>en</language><lastBuildDate>%DATE%</lastBuildDate><item><title>Hello</title><link>http://www.holovaty.com/test/</link><description>Testing.</description></item></channel></rss>"""
+ </description><language>en</language><lastBuildDate>%DATE%</lastBuildDate><item><title>Hello</title><link>http://www.holovaty.com/test/</link><description>Testing.</description><pubDate>Thu, 11 Aug 2016 00:00:00 -0000</pubDate></item></channel></rss>"""
EXPECTED_RESULT_ATOM = """<?xml version="1.0" encoding="utf-8"?>
-<feed xml:lang="en" xmlns="http://www.w3.org/2005/Atom"><title>Poynter E-Media Tidbits</title><link href="http://www.poynter.org/column.asp?id=31" rel="alternate"></link><id>http://www.poynter.org/column.asp?id=31</id><updated>%DATE%</updated><entry><title>Hello</title><link href="http://www.holovaty.com/test/" rel="alternate"></link><id>tag:www.holovaty.com:/test//</id><summary type="html">Testing.</summary><content type="html">Full content of our testing entry.</content></entry></feed>"""
+<feed xml:lang="en" xmlns="http://www.w3.org/2005/Atom"><title>Poynter E-Media Tidbits</title><link href="http://www.poynter.org/column.asp?id=31" rel="alternate"></link><id>http://www.poynter.org/column.asp?id=31</id><updated>%DATE%</updated><entry><title>Hello</title><link href="http://www.holovaty.com/test/" rel="alternate"></link><published>2016-08-11T00:00:00Z</published><updated>2016-08-11T00:00:00Z</updated><id>tag:www.holovaty.com,2016-08-11:/test/</id><summary type="html">Testin [...]
ENCODING = 'utf-8'
@@ -71,7 +73,10 @@ class TestFeedGenerator(unittest.TestCase):
for k, v in FIXT_FEED.items():
self.assertEqual(type(v), ty)
for k, v in FIXT_ITEM.items():
- self.assertEqual(type(v), ty)
+ if k == "pubdate" or k == "updateddate":
+ self.assertEqual(type(v), datetime.datetime)
+ else:
+ self.assertEqual(type(v), ty)
self.assertEqual(type(EXPECTED_RESULT_RSS), ty)
def test_001_string_results_rss(self):
@@ -97,15 +102,7 @@ class TestFeedGenerator(unittest.TestCase):
self.assertEqual(type(result), type(expected_result))
self.assertEqual(result, expected_result)
- def OFF_test_002_file_results(self):
- pass
- # DO-IT_YOURSELF: Run usage_example with python2 and python3.
- # Each will create a feed file.
- # Compare the files, they must be equal!
- # XXX Argh -- No, the lastBuildDate will differ.
- # But this is allowed.
-
- def test_003_string_results_atom(self):
+ def test_002_string_results_atom(self):
#import ipdb; ipdb.set_trace()
feed = feedgenerator.Atom1Feed(**FIXT_FEED)
feed.add_item(**FIXT_ITEM)
diff --git a/tests_feedgenerator/test_feedgenerator.pyc b/tests_feedgenerator/test_feedgenerator.pyc
index 10d393d..e36367d 100644
Binary files a/tests_feedgenerator/test_feedgenerator.pyc and b/tests_feedgenerator/test_feedgenerator.pyc differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/feedgenerator.git
More information about the Python-modules-commits
mailing list