Ibid

Merge lp:~stefanor/ibid/url-397900 into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. url-397900
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Superseded
Proposed branch: lp:~stefanor/ibid/url-397900
Merge into: lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target: None lines
To merge this branch: bzr merge lp:~stefanor/ibid/url-397900
Reviewer Review Type Date Requested Status
Michael Gorven Approve
Jonathan Hitchcock Approve
Review via email: mp+8608@code.launchpad.net

This proposal supersedes a proposal from 2009-07-10.

This proposal has been superseded by a proposal from 2009-07-13.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote : Posted in a previous version of this proposal

Yes, I've tested it, but that doesn't mean that you mustn't

Revision history for this message
Michael Gorven (mgorven) wrote : Posted in a previous version of this proposal

 review approve

review: Approve
Revision history for this message
Stefano Rivera (stefanor) wrote :

Test cases I used in the bug report (thanks mithrandi for the last one)

Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve

review: Approve
lp:~stefanor/ibid/url-397900 updated
712. By Stefano Rivera

Move dbus-ping.py to attic

713. By Stefano Rivera

Removed NOTES

714. By Stefano Rivera

Improve URL Match function, and add full TLD list

715. By Stefano Rivera

Fix the *far* from complete unit tests to work again

716. By Stefano Rivera

Add URL grabber tests

717. By Stefano Rivera

Forgotten testing code removed

718. By Stefano Rivera

Require a . in http head|get url

719. By Stefano Rivera

Remove extraneous imports

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/plugins/url.py'
2--- ibid/plugins/url.py 2009-07-10 12:01:48 +0000
3+++ ibid/plugins/url.py 2009-07-11 12:07:13 +0000
4@@ -112,7 +112,7 @@
5 password = Option('delicious_password', 'delicious account password')
6 delicious = Delicious()
7
8- @match(r'((?:\S+://|(?:www|ftp)\.)\S+|\S+\.(?:com|org|net|za)\S*)')
9+ @match(r'(?:[^@]\b|\A|<)((?:\w+://|(?:www|ftp)\.)\S+|[^@\s:]+\.(?:com|org|net|za)\S*?)(?:>|\b|Z)')
10 def grab(self, event, url):
11 if url.find('://') == -1:
12 if url.lower().startswith('ftp'):

Subscribers

People subscribed via source and target branches