Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5_fork
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5_fork
Commits
be552523
Commit
be552523
authored
Jul 11, 2013
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RSS reader: restore socket default timeout
parent
9310aef6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
bt5/erp5_knowledge_pad/ExtensionTemplateItem/GetRssDataAsDict.py
...5_knowledge_pad/ExtensionTemplateItem/GetRssDataAsDict.py
+6
-6
bt5/erp5_knowledge_pad/bt/revision
bt5/erp5_knowledge_pad/bt/revision
+1
-1
No files found.
bt5/erp5_knowledge_pad/ExtensionTemplateItem/GetRssDataAsDict.py
View file @
be552523
...
@@ -16,13 +16,15 @@ def getRssDataAsDict(self, url, username=None, password=None):
...
@@ -16,13 +16,15 @@ def getRssDataAsDict(self, url, username=None, password=None):
passman
.
add_password
(
None
,
url
,
username
,
password
)
passman
.
add_password
(
None
,
url
,
username
,
password
)
auth_handler
=
urllib2
.
HTTPBasicAuthHandler
(
passman
)
auth_handler
=
urllib2
.
HTTPBasicAuthHandler
(
passman
)
handlers
.
append
(
auth_handler
)
handlers
.
append
(
auth_handler
)
# set shorter timeouts and revert default at enf of read
# set shorter timeouts and revert default at enf of read
default_timeout
=
socket
.
getdefaulttimeout
()
default_timeout
=
socket
.
getdefaulttimeout
()
socket
.
setdefaulttimeout
(
60.0
)
socket
.
setdefaulttimeout
(
60.0
)
d
=
feedparser
.
parse
(
url
,
handlers
=
handlers
)
try
:
socket
.
setdefaulttimeout
(
default_timeout
)
d
=
feedparser
.
parse
(
url
,
handlers
=
handlers
)
finally
:
socket
.
setdefaulttimeout
(
default_timeout
)
if
d
.
bozo
and
isinstance
(
d
.
bozo_exception
,
urllib2
.
URLError
):
if
d
.
bozo
and
isinstance
(
d
.
bozo_exception
,
urllib2
.
URLError
):
# we have an URL error
# we have an URL error
return
{
'status'
:
-
2
}
return
{
'status'
:
-
2
}
...
@@ -33,9 +35,7 @@ def getRssDataAsDict(self, url, username=None, password=None):
...
@@ -33,9 +35,7 @@ def getRssDataAsDict(self, url, username=None, password=None):
return
{
'status'
:
-
3
}
return
{
'status'
:
-
3
}
elif
d
.
status
==
404
:
elif
d
.
status
==
404
:
return
{
'status'
:
-
4
}
return
{
'status'
:
-
4
}
result
[
'items'
]
=
[]
result
[
'items'
]
=
[]
# some feeds may not provide logo
# some feeds may not provide logo
if
d
.
feed
.
get
(
'image'
,
None
)
is
not
None
:
if
d
.
feed
.
get
(
'image'
,
None
)
is
not
None
:
...
...
bt5/erp5_knowledge_pad/bt/revision
View file @
be552523
764
765
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment