Merge openstack support from Soren Hansen.

pastebin.d/paste.openstack.org.conf

@@ -0,0 +1,18 @@
+[pastebin]
+basename = paste.openstack.org
+regexp = "http://paste.openstack.org"
+
+[format]
+lang = language
+page = page
+content = code
+post_format = post_format
+regexp = regexp
+target_url = target_url
+
+[defaults]
+page = "/json/?method=pastes.newPaste"
+post_format = "json"
+lang = ""
+regexp = "\"data\": \"([^"]*)"
+target_url = "http://paste.openstack.org/show/"

pastebinit

@@ -310,7 +310,11 @@ try:
     if "regexp" in params:
         reLink = params['regexp']
         del params["regexp"]
-
+    if "target_url" in params:
+        target_url = params["target_url"]
+        del params["target_url"]
+    else:
+        target_url = None
     if 'post_format' in params:
         post_format = params['post_format']
         del params['post_format']
@@ -332,7 +336,11 @@ try:
 
     try:
         if reLink: #Check if we have to apply a regexp
-            website = website.replace(tmp_page, "")
+            if target_url:
+                website = target_url
+            else:
+                website = website.replace(tmp_page, "")
+
             if reLink == '(.*)':
                 print page.read().strip()
             else: