Merge lp:~soren/pastebinit/paste.openstack.org into lp:pastebinit

Proposed by Soren Hansen
Status: Merged
Merged at revision: 131
Proposed branch: lp:~soren/pastebinit/paste.openstack.org
Merge into: lp:pastebinit
Prerequisite: lp:~soren/pastebinit/json-support
Diff against target: 52 lines (+28/-2)
2 files modified
pastebin.d/paste.openstack.org.conf (+18/-0)
pastebinit (+10/-2)
To merge this branch: bzr merge lp:~soren/pastebinit/paste.openstack.org
Reviewer Review Type Date Requested Status
Pastebinit Developers Pending
Review via email: mp+46906@code.launchpad.net

Description of the change

Add support for paste.openstack.org.

To post a comment you must log in.
105. By Soren Hansen

Remove print statement (left over from debugging).

106. By Soren Hansen

Make sure target_url variable always exists.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'pastebin.d/paste.openstack.org.conf'
2--- pastebin.d/paste.openstack.org.conf 1970-01-01 00:00:00 +0000
3+++ pastebin.d/paste.openstack.org.conf 2011-01-20 13:16:58 +0000
4@@ -0,0 +1,18 @@
5+[pastebin]
6+basename = paste.openstack.org
7+regexp = "http://paste.openstack.org"
8+
9+[format]
10+lang = language
11+page = page
12+content = code
13+post_format = post_format
14+regexp = regexp
15+target_url = target_url
16+
17+[defaults]
18+page = "/json/?method=pastes.newPaste"
19+post_format = "json"
20+lang = ""
21+regexp = "\"data\": \"([^"]*)"
22+target_url = "http://paste.openstack.org/show/"
23
24=== modified file 'pastebinit'
25--- pastebinit 2011-01-20 13:16:57 +0000
26+++ pastebinit 2011-01-20 13:16:58 +0000
27@@ -310,7 +310,11 @@
28 if "regexp" in params:
29 reLink = params['regexp']
30 del params["regexp"]
31-
32+ if "target_url" in params:
33+ target_url = params["target_url"]
34+ del params["target_url"]
35+ else:
36+ target_url = None
37 if 'post_format' in params:
38 post_format = params['post_format']
39 del params['post_format']
40@@ -332,7 +336,11 @@
41
42 try:
43 if reLink: #Check if we have to apply a regexp
44- website = website.replace(tmp_page, "")
45+ if target_url:
46+ website = target_url
47+ else:
48+ website = website.replace(tmp_page, "")
49+
50 if reLink == '(.*)':
51 print page.read().strip()
52 else:

Subscribers

People subscribed via source and target branches

to all changes: