Commit420da36

committed

Updated goo.gl service

1 parent4b1e37a commit420da36Copy full SHA for 420da36

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ def __str__(self):`
`13`	`13`	`returnrepr(self.reason)`
`14`	`14`
`15`	`15`	`"""Do a http request"""`
`16`		`-defrequest(url,parameters=None,username_pass=None,post_data=None):`
	`16`	`+defrequest(url,parameters=None,username_pass=None,post_data=None,headers={}):`
`17`	`17`
`18`	`18`	`# build url + parameters`
`19`	`19`	`ifparameters:`
`@@ -22,7 +22,6 @@ def request(url, parameters=None, username_pass=None, post_data=None):`
`22`	`22`	`url_params=url`
`23`	`23`
`24`	`24`	`# if username and pass supplied, build basic auth header`
`25`		`-headers= {}`
`26`	`25`	`ifusername_pass:`
`27`	`26`	`headers['Authorization']='Basic %s'%base64.b64encode('%s:%s'%username_pass)`
`28`	`27`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,15 @@`
`6`	`6`	`classGoogle(Service):`
`7`	`7`
`8`	`8`	`defshrink(self,bigurl):`
`9`		`-resp=request('http://goo.gl/api/url', {'url':bigurl},post_data='toolbar')`
	`9`	`+resp=request('https://www.googleapis.com/urlshortener/v1/url',`
	`10`	`+headers={"content-type":"application/json"},`
	`11`	`+post_data=json.dumps({"longUrl":bigurl}))`
`10`	`12`	`data=resp.read()`
`11`	`13`	`jdata=json.loads(data)`
`12`		`-if'short_url'notinjdata:`
	`14`	`+if'id'notinjdata:`
`13`	`15`	`raiseShortyError(data)`
`14`	`16`	`else:`
`15`		`-returnjdata['short_url']`
	`17`	`+returnjdata['id']`
`16`	`18`
`17`	`19`	`defqrcode(self,tinyurl):`
`18`	`20`	`qrdata=request(tinyurl+'.qr').read()`

Comments

(0)