Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
26ad2c41
Commit
26ad2c41
authored
Jun 20, 2013
by
Marco Mariani
Committed by
Cédric de Saint Martin
Jun 20, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typos
parent
bef72c49
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
slapos/slap/slap.py
slapos/slap/slap.py
+3
-3
No files found.
slapos/slap/slap.py
View file @
26ad2c41
...
@@ -578,7 +578,7 @@ class ConnectionHelper:
...
@@ -578,7 +578,7 @@ class ConnectionHelper:
xml
=
self
.
GET
(
method
)
xml
=
self
.
GET
(
method
)
except
NotFoundError
:
except
NotFoundError
:
# XXX: This is a ugly way to keep backward compatibility,
# XXX: This is a ugly way to keep backward compatibility,
# We should stablise slap library soon.
# We should stab
i
lise slap library soon.
xml
=
self
.
GET
(
'/getComputerInformation?computer_id=%s'
%
computer_id
)
xml
=
self
.
GET
(
'/getComputerInformation?computer_id=%s'
%
computer_id
)
return
xml_marshaller
.
loads
(
xml
)
return
xml_marshaller
.
loads
(
xml
)
...
@@ -612,7 +612,7 @@ class ConnectionHelper:
...
@@ -612,7 +612,7 @@ class ConnectionHelper:
raise
socket
.
error
(
str
(
exc
)
+
self
.
error_message_timeout
)
raise
socket
.
error
(
str
(
exc
)
+
self
.
error_message_timeout
)
raise
socket
.
error
(
self
.
error_message_connect_fail
+
str
(
exc
))
raise
socket
.
error
(
self
.
error_message_connect_fail
+
str
(
exc
))
# check
self.
response.status and raise exception early
# check response.status and raise exception early
if
response
.
status
==
httplib
.
REQUEST_TIMEOUT
:
if
response
.
status
==
httplib
.
REQUEST_TIMEOUT
:
# resource is not ready
# resource is not ready
raise
ResourceNotReady
(
path
)
raise
ResourceNotReady
(
path
)
...
@@ -649,7 +649,7 @@ class ConnectionHelper:
...
@@ -649,7 +649,7 @@ class ConnectionHelper:
raise
socket
.
error
(
self
.
error_message_connect_fail
+
str
(
exc
))
raise
socket
.
error
(
self
.
error_message_connect_fail
+
str
(
exc
))
response
=
self
.
connection
.
getresponse
()
response
=
self
.
connection
.
getresponse
()
# check
self.
response.status and raise exception early
# check response.status and raise exception early
if
response
.
status
==
httplib
.
REQUEST_TIMEOUT
:
if
response
.
status
==
httplib
.
REQUEST_TIMEOUT
:
# resource is not ready
# resource is not ready
raise
ResourceNotReady
(
"%s - %s"
%
(
path
,
parameter_dict
))
raise
ResourceNotReady
(
"%s - %s"
%
(
path
,
parameter_dict
))
...
...
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