15
15
from urllib .error import HTTPError
16
16
import urllib .parse as urllib
17
17
import html
18
+ from http .client import BadStatusLine
18
19
else :
19
20
import urllib2
20
21
from urllib2 import HTTPError
21
22
import urllib
22
23
from HTMLParser import HTMLParser
24
+ from httplib import BadStatusLine
23
25
24
26
import base64
25
27
import time
@@ -81,7 +83,7 @@ def authenticate(self, user, password):
81
83
try :
82
84
res = urllib2 .urlopen (request ).read ()
83
85
token = json .loads (res .decode ('utf-8' ))["access_token" ]
84
- except HTTPError :
86
+ except ( HTTPError , BadStatusLine ) :
85
87
raise SimplenoteLoginFailed ('Login to Simplenote API failed!' )
86
88
except IOError : # no connection exception
87
89
token = None
@@ -133,7 +135,7 @@ def get_note(self, noteid, version=None):
133
135
raise SimplenoteLoginFailed ('Login to Simplenote API failed! Check Token.' )
134
136
else :
135
137
return e , - 1
136
- except IOError as e :
138
+ except ( IOError , BadStatusLine ) as e :
137
139
return e , - 1
138
140
note = json .loads (response .read ().decode ('utf-8' ))
139
141
note = self .__add_simplenote_api_fields (note , noteid , int (response .info ().get ("X-Simperium-Version" )))
@@ -191,7 +193,7 @@ def update_note(self, note):
191
193
raise SimplenoteLoginFailed ('Login to Simplenote API failed! Check Token.' )
192
194
else :
193
195
return e , - 1
194
- except IOError as e :
196
+ except ( IOError , BadStatusLine ) as e :
195
197
return e , - 1
196
198
note_to_update = json .loads (response .read ().decode ('utf-8' ))
197
199
note_to_update = self .__add_simplenote_api_fields (note_to_update , noteid , int (response .info ().get ("X-Simperium-Version" )))
@@ -284,7 +286,7 @@ def get_note_list(self, data=True, since=None, tags=[]):
284
286
raise SimplenoteLoginFailed ('Login to Simplenote API failed! Check Token.' )
285
287
else :
286
288
return e , - 1
287
- except IOError as e :
289
+ except ( IOError , BadStatusLine ) as e :
288
290
return e , - 1
289
291
290
292
# get additional notes if bookmark was set in response
@@ -311,7 +313,7 @@ def get_note_list(self, data=True, since=None, tags=[]):
311
313
raise SimplenoteLoginFailed ('Login to Simplenote API failed! Check Token.' )
312
314
else :
313
315
return e , - 1
314
- except IOError as e :
316
+ except ( IOError , BadStatusLine ) as e :
315
317
return e , - 1
316
318
note_list = notes ["index" ]
317
319
self .current = response_notes ["current" ]
@@ -371,7 +373,7 @@ def delete_note(self, note_id):
371
373
request .add_header (self .header , self .get_token ())
372
374
try :
373
375
response = urllib2 .urlopen (request )
374
- except IOError as e :
376
+ except ( IOError , BadStatusLine ) as e :
375
377
return e , - 1
376
378
except HTTPError as e :
377
379
if e .code == 401 :
0 commit comments