Skip to content

Commit 66ec2c2

Browse files
committed
Corrected issue with property get/set not being honored.
1 parent 7254fa8 commit 66ec2c2

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

osdf.py

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,62 @@
77
import sys
88
from request import HttpRequest
99

10-
class OSDF:
10+
class OSDF(object):
1111
"""
1212
Communicates with an OSDF server's REST interface to facilitate several
1313
operations (node creation, deletion, queries, etc.)
1414
"""
1515

1616
def __init__(self, server, username, password, port=8123):
17-
self.server = server
18-
self.port = port
19-
self.username = username
20-
self.password = password
17+
self._server = server
18+
self._port = port
19+
self._username = username
20+
self._password = password
2121
self._request = HttpRequest(server, username, password, port=port)
2222

2323
@property
2424
def server(self):
25-
return self.server
25+
return self._server
2626

2727
@server.setter
2828
def server(self, server):
29-
self.server = server
29+
self._server = server
3030
# Redefine the request object
31-
self._request = HttpRequest(self.server, self.username,
32-
self.password, self.port)
31+
self._request = HttpRequest(self._server, self._username,
32+
self._password, self._port)
3333

3434
@property
3535
def port(self):
36-
return self.port
36+
return self._port
3737

38-
@server.setter
38+
@port.setter
3939
def port(self, port):
40-
self.port = port
40+
self._port = port
4141
# Redefine the request object
42-
self._request = HttpRequest(self.server, self.username,
43-
self.password, self.port)
42+
self._request = HttpRequest(self._server, self._username,
43+
self._password, self._port)
4444

4545
@property
4646
def username(self):
47-
return self.username
47+
return self._username
4848

4949
@username.setter
5050
def username(self, username):
51-
self.username = username
51+
self._username = username
5252
# Redefine the request object
53-
self._request = HttpRequest(self.server, self.username,
54-
self.password, self.port)
53+
self._request = HttpRequest(self._server, self._username,
54+
self._password, self._port)
5555

5656
@property
5757
def password(self):
58-
return self.password
58+
return self._password
5959

6060
@password.setter
61-
def username(self, username):
62-
self.password = password
61+
def password(self, password):
62+
self._password = password
6363
# Redefine the request object
64-
self._request = HttpRequest(self.server, self.username,
65-
self.password, self.port)
64+
self._request = HttpRequest(self._server, self._username,
65+
self._password, self._port)
6666

6767
def edit_node(self, json_data):
6868
"""

request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def __init__(self, status, message):
1212
def __str__(self):
1313
return "Error [%s]: %s" % (self.status, self.message)
1414

15-
class HttpRequest:
15+
class HttpRequest(object):
1616

1717
def __init__(self, server, username, password, port=8123):
1818
self.server = server

0 commit comments

Comments
 (0)