packages: pastebinit/pastebinit-bzr.patch (NEW) - rel 3; update from bzr trunk

[arekm]

Author: arekm                        Date: Sun Nov 21 15:02:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; update from bzr trunk

---- Files affected:
packages/pastebinit:
   pastebinit-bzr.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pastebinit/pastebinit-bzr.patch
diff -u /dev/null packages/pastebinit/pastebinit-bzr.patch:1.1
--- /dev/null	Sun Nov 21 16:02:28 2010
+++ packages/pastebinit/pastebinit-bzr.patch	Sun Nov 21 16:02:21 2010
@@ -0,0 +1,80 @@
+diff -urN pastebinit-1.1.org/pastebin.d/paste2.org.conf pastebinit-1.1/pastebin.d/paste2.org.conf
+--- pastebinit-1.1.org/pastebin.d/paste2.org.conf	2010-04-11 18:12:46.000000000 +0200
++++ pastebinit-1.1/pastebin.d/paste2.org.conf	2010-11-21 15:59:49.000000000 +0100
+@@ -10,5 +10,5 @@
+ parent = parent
+ 
+ [defaults]
+-page = 'new-paste'
++page = '/new-paste'
+ parent = 0
+diff -urN pastebinit-1.1.org/pastebin.d/pastebin.com.conf pastebinit-1.1/pastebin.d/pastebin.com.conf
+--- pastebinit-1.1.org/pastebin.d/pastebin.com.conf	2010-04-11 18:03:09.000000000 +0200
++++ pastebinit-1.1/pastebin.d/pastebin.com.conf	2010-11-21 15:59:49.000000000 +0100
+@@ -3,23 +3,21 @@
+ regexp = "http://((([a-zA-Z0-9\-_\.]*)(pastebin\.com)))"
+ 
+ [format]
+-content = paste_code
+-user = paste_name
++submit = submit
++parentpid = paste_parent_key
+ subdomain = paste_subdomain
+-private = paste_private
+-expiry = paste_expire_date
++content = paste_code
+ paste_format = paste_format
+-email = paste_email
++expiry = paste_expire_date
++private = paste_private
++remember = paste_remember
+ page = page
+-submit = submit
+-regexp = regexp
+ 
+ [defaults]
+-submit = submit
+-paste_format = text
++paste_format = 1
+ private = 0
++remember = 1
+ expiry = N
++submit = submit
+ subdomain = ""
+-email = ""
+-page = "/api_public.php"
+-regexp = "(.*)"
++page = "/post.php"
+diff -urN pastebinit-1.1.org/pastebin.d/yourpaste.net.conf pastebinit-1.1/pastebin.d/yourpaste.net.conf
+--- pastebinit-1.1.org/pastebin.d/yourpaste.net.conf	2010-04-11 18:08:12.000000000 +0200
++++ pastebinit-1.1/pastebin.d/yourpaste.net.conf	2010-11-21 15:59:49.000000000 +0100
+@@ -18,4 +18,4 @@
+ private = 0
+ remember = 0
+ page = '/paste'
+-regexp = '">http://yourpaste.net/(.*)</a>'
++regexp = '">http://yourpaste.net(.*)</a>'
+diff -urN pastebinit-1.1.org/pastebinit pastebinit-1.1/pastebinit
+--- pastebinit-1.1.org/pastebinit	2010-04-11 18:13:18.000000000 +0200
++++ pastebinit-1.1/pastebinit	2010-11-21 15:59:49.000000000 +0100
+@@ -25,7 +25,7 @@
+     gettext.textdomain("pastebinit")
+ 
+     defaultPB = "http://pastebin.com" #Default pastebin
+-    version = "1.1" #Version number to show in the usage
++    version = "1.0" #Version number to show in the usage
+     configfile = os.path.expanduser("~/.pastebinit.xml")
+ 
+     # Custom urlopener to handle 401's
+@@ -281,10 +281,7 @@
+     try:
+         if reLink: #Check if we have to apply a regexp
+             website = website.replace(tmp_page, "")
+-            if reLink == '(.*)':
+-                print page.read().strip()
+-            else:
+-                print website + re.split(reLink, page.read())[1] #Print the result of the Regexp
++            print website + "/" + re.split(reLink, page.read())[1] #Print the result of the Regexp
+         else:
+             print page.url #Get the final page and show the ur
+     except KeyboardInterrupt:
================================================================