|
7 | 7 | import sys |
8 | 8 | from request import HttpRequest |
9 | 9 |
|
10 | | -class OSDF: |
| 10 | +class OSDF(object): |
11 | 11 | """ |
12 | 12 | Communicates with an OSDF server's REST interface to facilitate several |
13 | 13 | operations (node creation, deletion, queries, etc.) |
14 | 14 | """ |
15 | 15 |
|
16 | 16 | 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 |
21 | 21 | self._request = HttpRequest(server, username, password, port=port) |
22 | 22 |
|
23 | 23 | @property |
24 | 24 | def server(self): |
25 | | - return self.server |
| 25 | + return self._server |
26 | 26 |
|
27 | 27 | @server.setter |
28 | 28 | def server(self, server): |
29 | | - self.server = server |
| 29 | + self._server = server |
30 | 30 | # 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) |
33 | 33 |
|
34 | 34 | @property |
35 | 35 | def port(self): |
36 | | - return self.port |
| 36 | + return self._port |
37 | 37 |
|
38 | | - @server.setter |
| 38 | + @port.setter |
39 | 39 | def port(self, port): |
40 | | - self.port = port |
| 40 | + self._port = port |
41 | 41 | # 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) |
44 | 44 |
|
45 | 45 | @property |
46 | 46 | def username(self): |
47 | | - return self.username |
| 47 | + return self._username |
48 | 48 |
|
49 | 49 | @username.setter |
50 | 50 | def username(self, username): |
51 | | - self.username = username |
| 51 | + self._username = username |
52 | 52 | # 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) |
55 | 55 |
|
56 | 56 | @property |
57 | 57 | def password(self): |
58 | | - return self.password |
| 58 | + return self._password |
59 | 59 |
|
60 | 60 | @password.setter |
61 | | - def username(self, username): |
62 | | - self.password = password |
| 61 | + def password(self, password): |
| 62 | + self._password = password |
63 | 63 | # 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) |
66 | 66 |
|
67 | 67 | def edit_node(self, json_data): |
68 | 68 | """ |
|
0 commit comments