Debugging improvements. Bump to 0.6.0.5

buriy · buriy · commit 8ff11e68a66f · 2015-07-27T11:59:17.000+06:00
diff --git a/readability/debug.py b/readability/debug.py
@@ -15,8 +15,8 @@ def describe_node(node):
     name = node.tag
     if node.get('id', ''):
         name += '#' + node.get('id')
-    if node.get('class', ''):
-        name += '.' + node.get('class').replace(' ', '.')
+    if node.get('class', '').strip():
+        name += '.' + '.'.join(node.get('class').split())
     if name[:4] in ['div#', 'div.']:
         name = name[3:]
     if name in ['tr', 'td', 'div', 'p']:
@@ -27,7 +27,7 @@ def describe_node(node):
     return name
 
 
-def describe(node, depth=2):
+def describe(node, depth=1):
     global uids, uids_document
     doc = node.getroottree().getroot()
     if doc != uids_document:
@@ -37,8 +37,8 @@ def describe(node, depth=2):
     #return repr(NodeRepr(node))
     parent = ''
     if depth and node.getparent() is not None:
-        parent = describe(node.getparent(), depth=depth - 1)
-    return parent + '/' + describe_node(node)
+        parent = describe(node.getparent(), depth=depth - 1) + '>'
+    return parent + describe_node(node)
 
 
 RE_COLLAPSE_WHITESPACES = re.compile('\s+', re.U)
diff --git a/readability/readability.py b/readability/readability.py
@@ -33,7 +33,7 @@
     #'trimRe': re.compile('^\s+|\s+$/'),
     #'normalizeRe': re.compile('\s{2,}/'),
     #'killBreaksRe': re.compile('(<br\s*\/?>(\s|&nbsp;?)*){1,}/'),
-    'videoRe': re.compile('http:\/\/(www\.)?(youtube|vimeo)\.com', re.I),
+    'videoRe': re.compile('https?:\/\/(www\.)?(youtube|vimeo)\.com', re.I),
     #skipFootnoteLink:      /^\s*(\[?[a-z0-9]{1,2}\]?|^|edit|citation needed)\s*$/i,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`#'trimRe': re.compile('^\s+\|\s+$/'),`
`34`	`34`	`#'normalizeRe': re.compile('\s{2,}/'),`
`35`	`35`	`#'killBreaksRe': re.compile('(<br\s\/?>(\s\| ?)){1,}/'),`
`36`		`- 'videoRe': re.compile('http:\/\/(www\.)?(youtube\|vimeo)\.com', re.I),`
	`36`	`+ 'videoRe': re.compile('https?:\/\/(www\.)?(youtube\|vimeo)\.com', re.I),`
`37`	`37`	`#skipFootnoteLink: /^\s(\[?[a-z0-9]{1,2}\]?\|^\|edit\|citation needed)\s$/i,`
`38`	`38`	`}`
`39`	`39`