>> format_attrs(p=None)
literal(u'')
"""
- strings = [u' %s="%s"' % (_attr_decode(attr), escape(value))
- for attr, value in sorted(attrs.iteritems())
+ strings = [' %s="%s"' % (_attr_decode(attr), escape(value))
+ for attr, value in sorted(attrs.items())
if value is not None]
return literal("".join(strings))
@@ -357,8 +357,8 @@
HTML = HTMLBuilder()
# Constants depending on ``literal()`` and/or ``HTML``.
-NL = literal(u"\n")
-EMPTY = literal(u"")
+NL = literal("\n")
+EMPTY = literal("")
BR = HTML.br(_nl=True)
-_CDATA_START = literal(u"")
+_CDATA_START = literal("")
--- ../python3/webhelpers/feedgenerator.py (original)
+++ ../python3/webhelpers/feedgenerator.py (refactored)
@@ -118,7 +118,7 @@
if date is not None:
tag = re.sub('/', ',%s:/' % date.strftime('%Y-%m-%d'), tag, 1)
tag = re.sub('#', '/', tag)
- return u'tag:' + tag
+ return 'tag:' + tag
class SyndicationFeed(object):
"Base class for all syndication feeds. Subclasses should provide write()"
@@ -212,7 +212,7 @@
"""
Returns the feed in the given encoding as a string.
"""
- from StringIO import StringIO
+ from io import StringIO
s = StringIO()
self.write(s, encoding)
return s.getvalue()
@@ -238,178 +238,178 @@
class RssFeed(SyndicationFeed):
mime_type = 'application/rss+xml'
- _version = u"?"
+ _version = "?"
def write(self, outfile, encoding):
handler = SimplerXMLGenerator(outfile, encoding)
handler.startDocument()
- handler.startElement(u"rss", self.rss_attributes())
- handler.startElement(u"channel", self.root_attributes())
+ handler.startElement("rss", self.rss_attributes())
+ handler.startElement("channel", self.root_attributes())
self.add_root_elements(handler)
self.write_items(handler)
self.endChannelElement(handler)
- handler.endElement(u"rss")
+ handler.endElement("rss")
def rss_attributes(self):
- return {u"version": self._version}
+ return {"version": self._version}
def write_items(self, handler):
for item in self.items:
- handler.startElement(u'item', self.item_attributes(item))
+ handler.startElement('item', self.item_attributes(item))
self.add_item_elements(handler, item)
- handler.endElement(u"item")
+ handler.endElement("item")
def add_root_elements(self, handler):
- handler.addQuickElement(u"title", self.feed['title'])
- handler.addQuickElement(u"link", self.feed['link'])
- handler.addQuickElement(u"description", self.feed['description'])
+ handler.addQuickElement("title", self.feed['title'])
+ handler.addQuickElement("link", self.feed['link'])
+ handler.addQuickElement("description", self.feed['description'])
if self.feed['language'] is not None:
- handler.addQuickElement(u"language", self.feed['language'])
+ handler.addQuickElement("language", self.feed['language'])
for cat in self.feed['categories']:
- handler.addQuickElement(u"category", cat)
+ handler.addQuickElement("category", cat)
if self.feed['feed_copyright'] is not None:
- handler.addQuickElement(u"copyright", self.feed['feed_copyright'])
- handler.addQuickElement(u"lastBuildDate", rfc2822_date(self.latest_post_date()).decode('utf-8'))
+ handler.addQuickElement("copyright", self.feed['feed_copyright'])
+ handler.addQuickElement("lastBuildDate", rfc2822_date(self.latest_post_date()).decode('utf-8'))
if self.feed['ttl'] is not None:
- handler.addQuickElement(u"ttl", self.feed['ttl'])
+ handler.addQuickElement("ttl", self.feed['ttl'])
def endChannelElement(self, handler):
- handler.endElement(u"channel")
+ handler.endElement("channel")
class RssUserland091Feed(RssFeed):
- _version = u"0.91"
+ _version = "0.91"
def add_item_elements(self, handler, item):
- handler.addQuickElement(u"title", item['title'])
- handler.addQuickElement(u"link", item['link'])
+ handler.addQuickElement("title", item['title'])
+ handler.addQuickElement("link", item['link'])
if item['description'] is not None:
- handler.addQuickElement(u"description", item['description'])
+ handler.addQuickElement("description", item['description'])
class Rss201rev2Feed(RssFeed):
# Spec: http://blogs.law.harvard.edu/tech/rss
- _version = u"2.0"
+ _version = "2.0"
def add_item_elements(self, handler, item):
- handler.addQuickElement(u"title", item['title'])
- handler.addQuickElement(u"link", item['link'])
+ handler.addQuickElement("title", item['title'])
+ handler.addQuickElement("link", item['link'])
if item['description'] is not None:
- handler.addQuickElement(u"description", item['description'])
+ handler.addQuickElement("description", item['description'])
# Author information.
if item["author_name"] and item["author_email"]:
- handler.addQuickElement(u"author", "%s (%s)" % \
+ handler.addQuickElement("author", "%s (%s)" % \
(item['author_email'], item['author_name']))
elif item["author_email"]:
- handler.addQuickElement(u"author", item["author_email"])
+ handler.addQuickElement("author", item["author_email"])
elif item["author_name"]:
- handler.addQuickElement(u"dc:creator", item["author_name"], {"xmlns:dc": u"http://purl.org/dc/elements/1.1/"})
+ handler.addQuickElement("dc:creator", item["author_name"], {"xmlns:dc": "http://purl.org/dc/elements/1.1/"})
if item['pubdate'] is not None:
- handler.addQuickElement(u"pubDate", rfc2822_date(item['pubdate']).decode('utf-8'))
+ handler.addQuickElement("pubDate", rfc2822_date(item['pubdate']).decode('utf-8'))
if item['comments'] is not None:
- handler.addQuickElement(u"comments", item['comments'])
+ handler.addQuickElement("comments", item['comments'])
if item['unique_id'] is not None:
- handler.addQuickElement(u"guid", item['unique_id'])
+ handler.addQuickElement("guid", item['unique_id'])
if item['ttl'] is not None:
- handler.addQuickElement(u"ttl", item['ttl'])
+ handler.addQuickElement("ttl", item['ttl'])
# Enclosure.
if item['enclosure'] is not None:
- handler.addQuickElement(u"enclosure", '',
- {u"url": item['enclosure'].url, u"length": item['enclosure'].length,
- u"type": item['enclosure'].mime_type})
+ handler.addQuickElement("enclosure", '',
+ {"url": item['enclosure'].url, "length": item['enclosure'].length,
+ "type": item['enclosure'].mime_type})
# Categories.
for cat in item['categories']:
- handler.addQuickElement(u"category", cat)
+ handler.addQuickElement("category", cat)
class Atom1Feed(SyndicationFeed):
# Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
mime_type = 'application/atom+xml'
- ns = u"http://www.w3.org/2005/Atom"
+ ns = "http://www.w3.org/2005/Atom"
def write(self, outfile, encoding):
handler = SimplerXMLGenerator(outfile, encoding)
handler.startDocument()
- handler.startElement(u'feed', self.root_attributes())
+ handler.startElement('feed', self.root_attributes())
self.add_root_elements(handler)
self.write_items(handler)
- handler.endElement(u"feed")
+ handler.endElement("feed")
def root_attributes(self):
if self.feed['language'] is not None:
- return {u"xmlns": self.ns, u"xml:lang": self.feed['language']}
+ return {"xmlns": self.ns, "xml:lang": self.feed['language']}
else:
- return {u"xmlns": self.ns}
+ return {"xmlns": self.ns}
def add_root_elements(self, handler):
- handler.addQuickElement(u"title", self.feed['title'])
- handler.addQuickElement(u"link", "", {u"rel": u"alternate", u"href": self.feed['link']})
+ handler.addQuickElement("title", self.feed['title'])
+ handler.addQuickElement("link", "", {"rel": "alternate", "href": self.feed['link']})
if self.feed['feed_url'] is not None:
- handler.addQuickElement(u"link", "", {u"rel": u"self", u"href": self.feed['feed_url']})
- handler.addQuickElement(u"id", self.feed['id'])
- handler.addQuickElement(u"updated", rfc3339_date(self.latest_post_date()).decode('utf-8'))
+ handler.addQuickElement("link", "", {"rel": "self", "href": self.feed['feed_url']})
+ handler.addQuickElement("id", self.feed['id'])
+ handler.addQuickElement("updated", rfc3339_date(self.latest_post_date()).decode('utf-8'))
if self.feed['author_name'] is not None:
- handler.startElement(u"author", {})
- handler.addQuickElement(u"name", self.feed['author_name'])
+ handler.startElement("author", {})
+ handler.addQuickElement("name", self.feed['author_name'])
if self.feed['author_email'] is not None:
- handler.addQuickElement(u"email", self.feed['author_email'])
+ handler.addQuickElement("email", self.feed['author_email'])
if self.feed['author_link'] is not None:
- handler.addQuickElement(u"uri", self.feed['author_link'])
- handler.endElement(u"author")
+ handler.addQuickElement("uri", self.feed['author_link'])
+ handler.endElement("author")
if self.feed['subtitle'] is not None:
- handler.addQuickElement(u"subtitle", self.feed['subtitle'])
+ handler.addQuickElement("subtitle", self.feed['subtitle'])
for cat in self.feed['categories']:
- handler.addQuickElement(u"category", "", {u"term": cat})
+ handler.addQuickElement("category", "", {"term": cat})
if self.feed['feed_copyright'] is not None:
- handler.addQuickElement(u"rights", self.feed['feed_copyright'])
+ handler.addQuickElement("rights", self.feed['feed_copyright'])
def write_items(self, handler):
for item in self.items:
- handler.startElement(u"entry", self.item_attributes(item))
+ handler.startElement("entry", self.item_attributes(item))
self.add_item_elements(handler, item)
- handler.endElement(u"entry")
+ handler.endElement("entry")
def add_item_elements(self, handler, item):
- handler.addQuickElement(u"title", item['title'])
- handler.addQuickElement(u"link", u"", {u"href": item['link'], u"rel": u"alternate"})
+ handler.addQuickElement("title", item['title'])
+ handler.addQuickElement("link", "", {"href": item['link'], "rel": "alternate"})
if item['pubdate'] is not None:
- handler.addQuickElement(u"updated", rfc3339_date(item['pubdate']).decode('utf-8'))
- handler.addQuickElement(u"published", rfc3339_date(item['pubdate']).decode('utf-8'))
+ handler.addQuickElement("updated", rfc3339_date(item['pubdate']).decode('utf-8'))
+ handler.addQuickElement("published", rfc3339_date(item['pubdate']).decode('utf-8'))
# Author information.
if item['author_name'] is not None:
- handler.startElement(u"author", {})
- handler.addQuickElement(u"name", item['author_name'])
+ handler.startElement("author", {})
+ handler.addQuickElement("name", item['author_name'])
if item['author_email'] is not None:
- handler.addQuickElement(u"email", item['author_email'])
+ handler.addQuickElement("email", item['author_email'])
if item['author_link'] is not None:
- handler.addQuickElement(u"uri", item['author_link'])
- handler.endElement(u"author")
+ handler.addQuickElement("uri", item['author_link'])
+ handler.endElement("author")
# Unique ID.
if item['unique_id'] is not None:
unique_id = item['unique_id']
else:
unique_id = get_tag_uri(item['link'], item['pubdate'])
- handler.addQuickElement(u"id", unique_id)
+ handler.addQuickElement("id", unique_id)
# Summary.
if item['description'] is not None:
- handler.addQuickElement(u"summary", item['description'], {u"type": u"html"})
+ handler.addQuickElement("summary", item['description'], {"type": "html"})
# Enclosure.
if item['enclosure'] is not None:
- handler.addQuickElement(u"link", '',
- {u"rel": u"enclosure",
- u"href": item['enclosure'].url,
- u"length": item['enclosure'].length,
- u"type": item['enclosure'].mime_type})
+ handler.addQuickElement("link", '',
+ {"rel": "enclosure",
+ "href": item['enclosure'].url,
+ "length": item['enclosure'].length,
+ "type": item['enclosure'].mime_type})
# Categories.
for cat in item['categories']:
- handler.addQuickElement(u"category", u"", {u"term": cat})
+ handler.addQuickElement("category", "", {"term": cat})
# Rights.
if item['item_copyright'] is not None:
- handler.addQuickElement(u"rights", item['item_copyright'])
+ handler.addQuickElement("rights", item['item_copyright'])
# This isolates the decision of what the system default is, so calling code can
# do "feedgenerator.DefaultFeed" instead of "feedgenerator.Rss201rev2Feed".
@@ -465,9 +465,9 @@
a unicode GeoRSS representation.
"""
if self.is_input_latitude_first:
- return u' '.join([u'%f %f' % x for x in coords])
+ return ' '.join(['%f %f' % x for x in coords])
else:
- return u' '.join([u'%f %f' % (x[1], x[0]) for x in coords])
+ return ' '.join(['%f %f' % (x[1], x[0]) for x in coords])
def add_georss_point(self, handler, coords, w3c_geo=False):
"""
@@ -480,10 +480,10 @@
lat, lon = coords[:2]
else:
lon, lat = coords[:2]
- handler.addQuickElement(u'geo:lat', u'%f' % lat)
- handler.addQuickElement(u'geo:lon', u'%f' % lon)
+ handler.addQuickElement('geo:lat', '%f' % lat)
+ handler.addQuickElement('geo:lon', '%f' % lon)
else:
- handler.addQuickElement(u'georss:point', self.georss_coords((coords,)))
+ handler.addQuickElement('georss:point', self.georss_coords((coords,)))
def add_georss_element(self, handler, item, w3c_geo=False):
"""
@@ -514,7 +514,7 @@
# If a GeoRSS box was given via tuple.
if not box_coords is None:
if w3c_geo: raise ValueError('Cannot use simple GeoRSS box in W3C Geo feeds.')
- handler.addQuickElement(u'georss:box', self.georss_coords(box_coords))
+ handler.addQuickElement('georss:box', self.georss_coords(box_coords))
else:
# Getting the lower-case geometry type.
gtype = str(geom.geom_type).lower()
@@ -525,10 +525,10 @@
# For formatting consistent w/the GeoRSS simple standard:
# http://georss.org/1.0#simple
if gtype in ('linestring', 'linearring'):
- handler.addQuickElement(u'georss:line', self.georss_coords(geom.coords))
+ handler.addQuickElement('georss:line', self.georss_coords(geom.coords))
elif gtype in ('polygon',):
# Only support the exterior ring.
- handler.addQuickElement(u'georss:polygon', self.georss_coords(geom[0].coords))
+ handler.addQuickElement('georss:polygon', self.georss_coords(geom[0].coords))
else:
raise ValueError('Geometry type "%s" not supported.' % geom.geom_type)
@@ -536,7 +536,7 @@
class GeoRSSFeed(Rss201rev2Feed, GeoFeedMixin):
def rss_attributes(self):
attrs = super(GeoRSSFeed, self).rss_attributes()
- attrs[u'xmlns:georss'] = u'http://www.georss.org/georss'
+ attrs['xmlns:georss'] = 'http://www.georss.org/georss'
return attrs
def add_item_elements(self, handler, item):
@@ -550,7 +550,7 @@
class GeoAtom1Feed(Atom1Feed, GeoFeedMixin):
def root_attributes(self):
attrs = super(GeoAtom1Feed, self).root_attributes()
- attrs[u'xmlns:georss'] = u'http://www.georss.org/georss'
+ attrs['xmlns:georss'] = 'http://www.georss.org/georss'
return attrs
def add_item_elements(self, handler, item):
@@ -564,7 +564,7 @@
class W3CGeoFeed(Rss201rev2Feed, GeoFeedMixin):
def rss_attributes(self):
attrs = super(W3CGeoFeed, self).rss_attributes()
- attrs[u'xmlns:geo'] = u'http://www.w3.org/2003/01/geo/wgs84_pos#'
+ attrs['xmlns:geo'] = 'http://www.w3.org/2003/01/geo/wgs84_pos#'
return attrs
RefactoringTool: No changes to ../python3/webhelpers/date.py
RefactoringTool: Refactored ../python3/webhelpers/containers.py
RefactoringTool: Refactored ../python3/webhelpers/constants.py
WARNING: couldn't encode ../python3/webhelpers/constants.py's diff for your terminal
RefactoringTool: No changes to ../python3/webhelpers/__init__.py
RefactoringTool: No changes to ../python3/unfinished/sanitize_filename.py
RefactoringTool: No changes to ../python3/unfinished/opener.py
RefactoringTool: No changes to ../python3/unfinished/number_to_human_size.py
RefactoringTool: Refactored ../python3/unfinished/multimedia.py
def add_item_elements(self, handler, item):
--- ../python3/webhelpers/containers.py (original)
+++ ../python3/webhelpers/containers.py (refactored)
@@ -40,7 +40,7 @@
args = tuple()
else:
args = self.default_factory,
- return type(self), args, None, None, self.items()
+ return type(self), args, None, None, list(self.items())
def copy(self):
return self.__copy__()
def __copy__(self):
@@ -48,7 +48,7 @@
def __deepcopy__(self, memo):
import copy
return type(self)(self.default_factory,
- copy.deepcopy(self.items()))
+ copy.deepcopy(list(self.items())))
def __repr__(self):
return 'defaultdict(%s, %s)' % (self.default_factory,
dict.__repr__(self))
@@ -116,8 +116,8 @@
If ``max_items`` is provided, return no more than that many items.
"""
- data = [(x[1], x[0]) for x in self.result.iteritems()]
- data.sort(key=lambda x: (sys.maxint - x[0], x[1]))
+ data = [(x[1], x[0]) for x in self.result.items()]
+ data.sort(key=lambda x: (sys.maxsize - x[0], x[1]))
if max_items:
return data[:max_items]
else:
@@ -126,7 +126,7 @@
def get_sorted_items(self):
"""Return the result as a list of ``(item, count)`` pairs sorted by item.
"""
- data = self.result.items()
+ data = list(self.result.items())
data.sort()
return data
@@ -279,7 +279,7 @@
raise KeyError("key %r is not in original mapping" % k)
r1 = {}
r2 = {}
- for k, v in dic.items():
+ for k, v in list(dic.items()):
if k in keys:
r1[k] = v
else:
@@ -316,7 +316,7 @@
elif default is not NotGiven:
yield key, default
if other_keys:
- for key, value in d.iteritems():
+ for key, value in d.items():
yield key, value
def get_many(d, required=None, optional=None, one_of=None):
--- ../python3/webhelpers/constants.py (original)
+++ ../python3/webhelpers/constants.py (refactored)
@@ -107,7 +107,7 @@
return _country_codes
else:
- text_directly_from_iso_website = u"""
+ text_directly_from_iso_website = """
A
AFGHANISTAN AF
--- ../python3/unfinished/multimedia.py (original)
+++ ../python3/unfinished/multimedia.py (refactored)
@@ -87,7 +87,7 @@
"""
try:
im = Image.open(image_path)
- except IOError, e:
+ except IOError as e:
if str(e) == "cannot identify image file":
return None
else:
@@ -118,7 +118,7 @@
im = im.convert() # Convert GIF palette to RGB mode.
try:
im.thumbnail((width, height), Image.ANTIALIAS)
- except IOError, e:
+ except IOError as e:
reason = str(e)
if RX_DECODER_NOT_AVAILABLE.search(reason):
return None # PIL error, cannot thumbnail.
@@ -184,9 +184,9 @@
return os.path.join(dir, new_name)
def test():
- print "Height for 600x480 @ width 200 is", choose_height(200, 600, 480)
- print "Path 200 for a/foo.jpg is", get_thumb_path('a/foo.jpg', 200)
- print "Path 200 for a/foo.png is", get_thumb_path('a/foo.png', 200)
+ print("Height for 600x480 @ width 200 is", choose_height(200, 600, 480))
+ print("Path 200 for a/foo.jpg is", get_thumb_path('a/foo.jpg', 200))
+ print("Path 200 for a/foo.png is", get_thumb_path('a/foo.png', 200))
if __name__ == "__main__": test()
@@ -328,7 +328,7 @@
width = 200
dst = make_pdf_thumbnail2(source_file, width)
- print "Thumbnail made:", dst
+ print("Thumbnail made:", dst)
#ps_cmd = "save pop currentglobal true setglobal false/product where{pop product(Ghostscript)search{pop pop pop revision 600 ge{pop true}if}{pop}ifelse}if{/pdfdict where{pop pdfdict begin/pdfshowpage_setpage[pdfdict/pdfshowpage_setpage get{dup type/nametype eq{dup/OutputFileRefactoringTool: Refactored ../python3/unfinished/logging_optparse.py
RefactoringTool: No changes to ../python3/unfinished/document.py
RefactoringTool: Refactored ../python3/unfinished/disabled_test_pylonslib_minify.py
eq{pop/AntiRotationHack}{dup/MediaBox eq revision 650 ge and{/THB.CropHack{1 index/CropBox pget{2 index exch/MediaBox exch put}if}def/THB.CropHack cvx}if}ifelse}if}forall]cvx def end}if}if setglobal"
--- ../python3/unfinished/logging_optparse.py (original)
+++ ../python3/unfinished/logging_optparse.py (refactored)
@@ -215,5 +215,5 @@
if logger == "__main__":
# Set root logger to same level.
logging.getLogger().setLevel(level)
- except LogLevelError, e:
+ except LogLevelError as e:
parser.error("log level '%s' not defined" % e.level)
--- ../python3/unfinished/disabled_test_pylonslib_minify.py (original)
+++ ../python3/unfinished/disabled_test_pylonslib_minify.py (refactored)
@@ -79,42 +79,42 @@
# minify and combine
js_source = self.minify.javascript_link('/deep/a.js', '/b.js', combined=True, minified=True)
css_source = self.minify.stylesheet_link('/deep/a.css', '/b.css', combined=True, minified=True)
- self.assert_('"/a.b.COMBINED.min.css"' in css_source)
- self.assert_('"/a.b.COMBINED.min.js"' in js_source)
+ self.assertTrue('"/a.b.COMBINED.min.css"' in css_source)
+ self.assertTrue('"/a.b.COMBINED.min.js"' in js_source)
# combine
js_source = self.minify.javascript_link('/deep/a.js', '/b.js', combined=True)
css_source = self.minify.stylesheet_link('/deep/a.css', '/b.css', combined=True)
- self.assert_('"/a.b.COMBINED.css"' in css_source)
- self.assert_('"/a.b.COMBINED.js"' in js_source)
+ self.assertTrue('"/a.b.COMBINED.css"' in css_source)
+ self.assertTrue('"/a.b.COMBINED.js"' in js_source)
# minify
js_source = self.minify.javascript_link('/deep/a.js', '/b.js', minified=True)
css_source = self.minify.stylesheet_link('/deep/a.css', '/b.css', minified=True)
- self.assert_('"/deep/a.min.css"' in css_source)
- self.assert_('"/b.min.css"' in css_source)
- self.assert_('"/deep/a.min.js"' in js_source)
- self.assert_('"/b.min.js"' in js_source)
+ self.assertTrue('"/deep/a.min.css"' in css_source)
+ self.assertTrue('"/b.min.css"' in css_source)
+ self.assertTrue('"/deep/a.min.js"' in js_source)
+ self.assertTrue('"/b.min.js"' in js_source)
# root minify and combined
js_source = self.minify.javascript_link('/c.js', '/b.js', combined=True, minified=True)
css_source = self.minify.stylesheet_link('/c.css', '/b.css', combined=True, minified=True)
- self.assert_('"/c.b.COMBINED.min.css"' in css_source)
- self.assert_('"/c.b.COMBINED.min.js"' in js_source)
+ self.assertTrue('"/c.b.COMBINED.min.css"' in css_source)
+ self.assertTrue('"/c.b.COMBINED.min.js"' in js_source)
# root minify
js_source = self.minify.javascript_link('/c.js', '/b.js', minified=True)
css_source = self.minify.stylesheet_link('/c.css', '/b.css', minified=True)
- self.assert_('"/b.min.css"' in css_source)
- self.assert_('"/b.min.js"' in js_source)
- self.assert_('"/c.min.js"' in js_source)
- self.assert_('"/c.min.js"' in js_source)
+ self.assertTrue('"/b.min.css"' in css_source)
+ self.assertTrue('"/b.min.js"' in js_source)
+ self.assertTrue('"/c.min.js"' in js_source)
+ self.assertTrue('"/c.min.js"' in js_source)
# both root minify and combined
js_source = self.minify.javascript_link('/deep/a.js', '/deep/d.js', combined=True, minified=True)
css_source = self.minify.stylesheet_link('/deep/a.css', '/deep/d.css', combined=True, minified=True)
- self.assert_('"/deep/a.d.COMBINED.min.css"' in css_source)
- self.assert_('"/deep/a.d.COMBINED.min.js"' in js_source)
+ self.assertTrue('"/deep/a.d.COMBINED.min.css"' in css_source)
+ self.assertTrue('"/deep/a.d.COMBINED.min.js"' in js_source)
# Cleanup -- done by .tearDown()
#self.purge_files('a.b.COMBINED.min.js', 'a.b.CORefactoringTool: Refactored ../python3/unfinished/containers.py
RefactoringTool: Refactored ../python3/unfinished/baseN.py
RefactoringTool: No changes to ../python3/tests/util.py
RefactoringTool: Refactored ../python3/tests/test_tools.py
MBINED.min.css')
--- ../python3/unfinished/containers.py (original)
+++ ../python3/unfinished/containers.py (refactored)
@@ -16,7 +16,7 @@
if n > 0:
extension = [fill] * n
lis.extend(extension)
- return zip(*data)
+ return list(zip(*data))
def izip_fill(*iterables, **kw):
"""Like itertools.izip but use a default value for the missing elements
@@ -26,18 +26,18 @@
``default`` is the default value (default ``None``, must be a keyword
arg.
"""
- iterables = map(iter, iterables)
+ iterables = list(map(iter, iterables))
default = kw.pop('default', None)
if kw:
raise TypeError("unrecognized keyword arguments")
columns = len(iterables)
- columns_range = range(columns)
+ columns_range = list(range(columns))
while True:
found_data = False
row = [None] * columns
for i in columns_range:
try:
- row[i] = iterables[i].next()
+ row[i] = next(iterables[i])
found_data = True
except StopIteration:
row[i] = default
--- ../python3/unfinished/baseN.py (original)
+++ ../python3/unfinished/baseN.py (refactored)
@@ -59,7 +59,7 @@
s = list(s)
alphabet = list(alphabet)
base = len(alphabet)
- inverse_alphabet = dict(zip(alphabet, xrange(0, base)))
+ inverse_alphabet = dict(list(zip(alphabet, list(range(0, base)))))
n = 0
exp = 0
for i in reversed(s):
--- ../python3/tests/test_tools.py (original)
+++ ../python3/tests/test_tools.py (refactored)
@@ -74,50 +74,50 @@
}
result_values = {}
- for k, v in result_values_templates.iteritems():
+ for k, v in result_values_templates.items():
result_values[k] = Template(v).substitute(raw_values)
self.assertEqual(result_values["email_result"], auto_link(raw_values['email_raw'], 'email_addresses'))
- self.assertEqual(u"hello %(email_result)s" % result_values, auto_link("hello %(email_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Go to %(link_result)s" % result_values, auto_link("Go to %(link_raw)s" % raw_values, 'urls'))
- self.assertEqual(u"Go to %(link_raw)s" % raw_values, auto_link("Go to %(link_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Go to %(link_result)s and say hello to %(email_result)s" % result_values, auto_link("Go to %(link_raw)s and say hello to %(email_raw)s" % raw_values))
- self.assertEqual(u"Link %(link_result)s
" % result_values, auto_link(literal("Link %(link_raw)s
") % raw_values))
- self.assertEqual(u"%(link_result)s Link
" % result_values, auto_link(literal("%(link_raw)s Link
") % raw_values))
- self.assertEqual(u"Link %(link_result_with_options)s
" % result_values, auto_link(literal("Link %(link_raw)s
") % raw_values, 'all', target='_blank'))
- self.assertEqual(u"Go to %(link_result)s." % result_values, auto_link("Go to %(link_raw)s." % raw_values))
- self.assertEqual(u"Go to %(link_result)s, then say hello to %(email_result)s.
" % result_values, auto_link(literal("Go to %(link_raw)s, then say hello to %(email_raw)s.
") % raw_values))
- self.assertEqual(u"Go to %(link2_result)s" % result_values, auto_link("Go to %(link2_raw)s" % raw_values, 'urls'))
- self.assertEqual(u"Go to %(link2_raw)s" % raw_values, auto_link("Go to %(link2_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Link %(link2_result)s
" % result_values, auto_link(literal("Link %(link2_raw)s
") % raw_values))
- self.assertEqual(u"%(link2_result)s Link
" % result_values, auto_link(literal("%(link2_raw)s Link
") % raw_values))
- self.assertEqual(u"Go to %(link2_result)s." % result_values, auto_link(literal("Go to %(link2_raw)s.") % raw_values))
- self.assertEqual(u"Say hello to %(email_result)s, then go to %(link2_result)s.
" % result_values, auto_link(literal("Say hello to %(email_raw)s, then go to %(link2_raw)s.
") % raw_values))
- self.assertEqual(u"Go to %(link3_result)s" % result_values, auto_link("Go to %(link3_raw)s" % raw_values, 'urls'))
- self.assertEqual(u"Go to %(link3_raw)s" % raw_values, auto_link("Go to %(link3_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Link %(link3_result)s
" % result_values, auto_link(literal("Link %(link3_raw)s
") % raw_values))
- self.assertEqual(u"%(link3_result)s Link
" % result_values, auto_link(literal("%(link3_raw)s Link
") % raw_values))
- self.assertEqual(u"Go to %(link3_result)s." % result_values, auto_link("Go to %(link3_raw)s." % raw_values))
- self.assertEqual(u"Go to %(link3_result)s. seriously, %(link3_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link3_raw)s. seriously, %(link3_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
- self.assertEqual(u"Link %(link4_result)s
" % result_values, auto_link(literal("Link %(link4_raw)s
") % raw_values))
- self.assertEqual(u"%(link4_result)s Link
" % result_values, auto_link(literal("%(link4_raw)s Link
") % raw_values))
- self.assertEqual(u"%(link5_result)s Link
" % result_values, auto_link(literal("%(link5_raw)s Link
") % raw_values))
- self.assertEqual(u"%(link6_result)s Link
" % result_values, auto_link(literal("%(link6_raw)s Link
") % raw_values))
- self.assertEqual(u"%(link7_result)s Link
" % result_values, auto_link(literal("%(link7_raw)s Link
") % raw_values))
- self.assertEqual(u"Go to %(link8_result)s" % result_values, auto_link("Go to %(link8_raw)s" % raw_values, 'urls'))
- self.assertEqual(u"Go to %(link8_raw)s" % raw_values, auto_link("Go to %(link8_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Link %(link8_result)s
" % result_values, auto_link(literal("Link %(link8_raw)s
") % raw_values))
- self.assertEqual(u"%(link8_result)s Link
" % result_values, auto_link(literal("%(link8_raw)s Link
") % raw_values))
- self.assertEqual(u"Go to %(link8_result)s." % result_values, auto_link("Go to %(link8_raw)s." % raw_values))
- self.assertEqual(u"Go to %(link8_result)s. seriously, %(link8_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link8_raw)s. seriously, %(link8_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
- self.assertEqual(u"Go to %(link9_result)s" % result_values, auto_link("Go to %(link9_raw)s" % raw_values, 'urls'))
- self.assertEqual(u"Go to %(link9_raw)s" % raw_values, auto_link("Go to %(link9_raw)s" % raw_values, 'email_addresses'))
- self.assertEqual(u"Link %(link9_result)s
" % result_values, auto_link(literal("Link %(link9_raw)s
") % raw_values))
- self.assertEqual(u"%(link9_result)s Link
" % result_values, auto_link(literal("%(link9_raw)s Link
") % raw_values))
- self.assertEqual(u"Go to %(link9_result)s." % result_values, auto_link("Go to %(link9_raw)s." % raw_values))
- self.assertEqual(u"Go to %(link9_result)s. seriously, %(link9_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link9_raw)s. seriously, %(link9_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
- self.assertEqual(u"", auto_link(None))
- self.assertEqual(u"", auto_link(""))
+ self.assertEqual("hello %(email_result)s" % result_values, auto_link("hello %(email_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Go to %(link_result)s" % result_values, auto_link("Go to %(link_raw)s" % raw_values, 'urls'))
+ self.assertEqual("Go to %(link_raw)s" % raw_values, auto_link("Go to %(link_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Go to %(link_result)s and say hello to %(email_result)s" % result_values, auto_link("Go to %(link_raw)s and say hello to %(email_raw)s" % raw_values))
+ self.assertEqual("Link %(link_result)s
" % result_values, auto_link(literal("Link %(link_raw)s
") % raw_values))
+ self.assertEqual("%(link_result)s Link
" % result_values, auto_link(literal("%(link_raw)s Link
") % raw_values))
+ self.assertEqual("Link %(link_result_with_options)s
" % result_values, auto_link(literal("Link %(link_raw)s
") % raw_values, 'all', target='_blank'))
+ self.assertEqual("Go to %(link_result)s." % result_values, auto_link("Go to %(link_raw)s." % raw_values))
+ self.assertEqual("Go to %(link_result)s, then say hello to %(email_result)s.
" % result_values, auto_link(literal("Go to %(link_raw)s, then say hello to %(email_raw)s.
") % raw_values))
+ self.assertEqual("Go to %(link2_result)s" % result_values, auto_link("Go to %(link2_raw)s" % raw_values, 'urls'))
+ self.assertEqual("Go to %(link2_raw)s" % raw_values, auto_link("Go to %(link2_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Link %(link2_result)s
" % result_values, auto_link(literal("Link %(link2_raw)s
") % raw_values))
+ self.assertEqual("%(link2_result)s Link
" % result_values, auto_link(literal("%(link2_raw)s Link
") % raw_values))
+ self.assertEqual("Go to %(link2_result)s." % result_values, auto_link(literal("Go to %(link2_raw)s.") % raw_values))
+ self.assertEqual("Say hello to %(email_result)s, then go to %(link2_result)s.
" % result_values, auto_link(literal("Say hello to %(email_raw)s, then go to %(link2_raw)s.
") % raw_values))
+ self.assertEqual("Go to %(link3_result)s" % result_values, auto_link("Go to %(link3_raw)s" % raw_values, 'urls'))
+ self.assertEqual("Go to %(link3_raw)s" % raw_values, auto_link("Go to %(link3_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Link %(link3_result)s
" % result_values, auto_link(literal("Link %(link3_raw)s
") % raw_values))
+ self.assertEqual("%(link3_result)s Link
" % result_values, auto_link(literal("%(link3_raw)s Link
") % raw_values))
+ self.assertEqual("Go to %(link3_result)s." % result_values, auto_link("Go to %(link3_raw)s." % raw_values))
+ self.assertEqual("Go to %(link3_result)s. seriously, %(link3_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link3_raw)s. seriously, %(link3_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
+ self.assertEqual("Link %(link4_result)s
" % result_values, auto_link(literal("Link %(link4_raw)s
") % raw_values))
+ self.assertEqual("%(link4_result)s Link
" % result_values, auto_link(literal("%(link4_raw)s Link
") % raw_values))
+ self.assertEqual("%(link5_result)s Link
" % result_values, auto_link(literal("%(link5_raw)s Link
") % raw_values))
+ self.assertEqual("%(link6_result)s Link
" % result_values, auto_link(literal("%(link6_raw)s Link
") % raw_values))
+ self.assertEqual("%(link7_result)s Link
" % result_values, auto_link(literal("%(link7_raw)s Link
") % raw_values))
+ self.assertEqual("Go to %(link8_result)s" % result_values, auto_link("Go to %(link8_raw)s" % raw_values, 'urls'))
+ self.assertEqual("Go to %(link8_raw)s" % raw_values, auto_link("Go to %(link8_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Link %(link8_result)s
" % result_values, auto_link(literal("Link %(link8_raw)s
") % raw_values))
+ self.assertEqual("%(link8_result)s Link
" % result_values, auto_link(literal("%(link8_raw)s Link
") % raw_values))
+ self.assertEqual("Go to %(link8_result)s." % result_values, auto_link("Go to %(link8_raw)s." % raw_values))
+ self.assertEqual("Go to %(link8_result)s. seriously, %(link8_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link8_raw)s. seriously, %(link8_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
+ self.assertEqual("Go to %(link9_result)s" % result_values, auto_link("Go to %(link9_raw)s" % raw_values, 'urls'))
+ self.assertEqual("Go to %(link9_raw)s" % raw_values, auto_link("Go to %(link9_raw)s" % raw_values, 'email_addresses'))
+ self.assertEqual("Link %(link9_result)s
" % result_values, auto_link(literal("Link %(link9_raw)s
") % raw_values))
+ self.assertEqual("%(link9_result)s Link
" % result_values, auto_link(literal("%(link9_raw)s Link
") % raw_values))
+ self.assertEqual("Go to %(link9_result)s." % result_values, auto_link("Go to %(link9_raw)s." % raw_values))
+ self.assertEqual("Go to %(link9_result)s. seriously, %(link9_result)s? i think I'll say hello to %(email_result)s. instead.
" % result_values, auto_link(literal("Go to %(link9_raw)s. seriously, %(link9_raw)s? i think I'll say hello to %(email_raw)s. instead.
") % raw_values))
+ self.assertEqual("", auto_link(None))
+ self.assertEqual("", auto_link(""))
# Failing test: PylonsHQ bug #657
#self.assertEqual(u'<www.google.com>', auto_link(""))
@@ -131,80 +131,80 @@
class TestURLHelper(WebHelpersTestCase):
def test_button_to_with_straight_url(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com"))
def test_button_to_with_query(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com/q1=v1&q2=v2"))
def test_button_to_with_escaped_query(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com/q1=v1&q2=v2"))
def test_button_to_with_query_and_no_name(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to(None, "http://www.example.com?q1=v1&q2=v2"))
def test_button_to_enabled_disabled(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", disabled=False))
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", disabled=True))
def test_button_to_with_method_delete(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", method='DELETE'))
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", method='delete'))
def test_button_to_with_method_get(self):
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", method='get'))
- self.assertEqual(u"",
+ self.assertEqual("",
button_to("Hello", "http://www.example.com", method='GET'))
def test_button_to_with_img(self):
- self.assertEqual(u'',
+ self.assertEqual('',
button_to("Edit", '/content/edit/3', type='image', src='/images/icon_delete.gif'))
- self.assertEqual(u'',
+ self.assertEqual('',
button_to("Submit", '/content/submit/3', type='image', src='submit.png', alt='Complete the form'))
def test_mail_to(self):
- self.assertEqual(u'justin@example.com', mail_to("justin@example.com"))
- self.assertEqual(u'Justin Example', mail_to("justin@example.com", "Justin Example"))
- self.assertEqual(u'Justin Example',
+ self.assertEqual('justin@example.com', mail_to("justin@example.com"))
+ self.assertEqual('Justin Example', mail_to("justin@example.com", "Justin Example"))
+ self.assertEqual('Justin Example',
mail_to("justin@example.com", "Justin Example", class_="admin"))
def test_mail_to_with_javascript(self):
- self.assertEqual(u"", mail_to("me@domain.com", "My email", encode = "javascript"))
+ self.assertEqual("", mail_to("me@domain.com", "My email", encode = "javascript"))
def test_mail_to_with_options(self):
- self.assertEqual(u'My email',
+ self.assertEqual('My email',
mail_to("me@example.com", "My email", cc="ccaddress@example.com",
bcc="bccaddress@example.com", subject="This is an example email",
body="This is the body of the message."))
def test_mail_to_with_img(self):
- self.assertEqual(u'
',
+ self.assertEqual('',
mail_to('feedback@example.com', HTML.literal('')))
def test_mail_to_with_hex(self):
- self.assertEqual(u"My email",
+ self.assertEqual("My email",
mail_to("me@domain.com", "My email", encode = "hex"))
- self.assertEqual(u"me@domain.com",
+ self.assertEqual("me@domain.com",
mail_to("me@domain.com", None, encode = "hex"))
def test_mail_to_with_replace_options(self):
- self.assertEqual(u'wolfgang(at)stufenlos(dot)net',
+ self.assertEqual('wolfgang(at)stufenlos(dot)net',
mail_to("wolfgang@stufenlos.net", None, replace_at="(at)", replace_dot="(dot)"))
- self.assertEqual(u"me(at)domain.com",
+ self.assertEqual("me(at)domain.com",
mail_to("me@domain.com", None, encode = "hex", replace_at = "(at)"))
- self.assertEqual(u"My email",
+ self.assertEqual("My email",
mail_to("me@domain.com", "My email", encode = "hex", replace_at = "(at)"))
- self.assertEqual(u"me(at)domain(dot)com",
+ self.assertEqual("me(at)domain(dot)com",
mail_to("me@domain.com", None, encode = "hex", replace_at = "(at)", replace_dot = "(dot)"))
- self.assertEqual(u"",
+ self.assertEqual("",
mail_to("me@domain.com", "My email", encode = "javascript", replace_at = "(at)", replace_dot = "(dot)"))
@@ -247,9 +247,9 @@
style="color:red"))
def test_highlight_literal(self):
- eq_(literal(u'The <red> cat.'),
+ eq_(literal('The <red> cat.'),
highlight("The cat.", "at"))
- eq_(literal(u'The cat.'),
+ eq_(literal('The cat.'),
highlight(literal("The cat."), "at"))
def test_highlight_legacy_highlighter(self):
@@ -259,15 +259,15 @@
class TestStripTagsHelper(WebHelpersTestCase):
def test_compare_strip_tags_to_sanitize(self):
- text = u'I really like steak!'
+ text = 'I really like steak!'
eq_(strip_tags(text), render.sanitize(text))
if __name__ == '__main__':
- suite = map(unittest.makeSuite, [
+ suite = list(map(unittest.makeSuite, [
TestToolsHelper,
TestHighlightHelper,
TestURLHelper,
TestStripTagsHelper,
- ])
+ ]))
for testsuite in suite:
unittest.TextTestRunner(verbosity=1).run(testsuite)
--- ../python3/tests/test_text.py (original)
+++ ../python3/tests/test_text.py (refactored)
@@ -27,8 +27,8 @@
excerpt('This is a beautiful? morning', 'beautiful', 5))
def test_excerpt_with_utf8(self):
--- ../python3/tests/test_tags.py (original)
+++ ../python3/tests/test_tags.py (refactored)
@@ -11,148 +11,148 @@
def test_check_box(self):
eq_(
checkbox("admin"),
- u'',
+ '',
)
def test_form(self):
eq_(
form(url="http://www.example.com"),
- u'