Skip to content

Commit a2d9245

Browse files
NeetujNeetuj
committed
solving tox complaints
1 parent 8234ee5 commit a2d9245

3 files changed

Lines changed: 52 additions & 46 deletions

File tree

‎SoftLayer/managers/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
:license: MIT, see LICENSE for more details.
99
"""
1010
# pylint: disable=w0401
11-
11+
from SoftLayer.managers.billing import BillingManager # NOQA
1212
from SoftLayer.managers.cdn import CDNManager # NOQA
1313
from SoftLayer.managers.dns import DNSManager # NOQA
1414
from SoftLayer.managers.firewall import FirewallManager # NOQA
@@ -24,10 +24,10 @@
2424
from SoftLayer.managers.ssl import SSLManager # NOQA
2525
from SoftLayer.managers.ticket import TicketManager # NOQA
2626
from SoftLayer.managers.vs import VSManager # NOQA
27-
from SoftLayer.managers.billing import BillingManager # NOQA
2827

29-
__all__ = ['DNSManager', 'FirewallManager', 'HardwareManager',
30-
'ImageManager', 'MessagingManager', 'MetadataManager', 'CDNManager',
31-
'NetworkManager', 'SshKeyManager', 'SSLManager', 'TicketManager',
28+
__all__ = ['BillingManager', 'DNSManager', 'FirewallManager',
29+
'HardwareManager', 'ImageManager', 'MessagingManager',
30+
'MetadataManager', 'CDNManager', 'NetworkManager',
31+
'SshKeyManager', 'SSLManager', 'TicketManager',
3232
'VSManager', 'ISCSIManager', 'LoadBalancerManager',
33-
'OrderingManager', 'BillingManager']
33+
'OrderingManager']

‎SoftLayer/managers/billing.py‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
66
:license: MIT, see LICENSE for more details.
77
"""
8-
from SoftLayer.utils import NestedDict, query_filter, query_filter_date
9-
from calendar import monthrange
10-
from datetime import datetime, timedelta
8+
import calendar
9+
import datetime
10+
11+
from SoftLayer import utils
12+
1113
import math
1214
import time
1315

@@ -19,83 +21,82 @@ class BillingManager(object):
1921
"""
2022

2123
def _format_date(self, date):
22-
"""
24+
"""format date.
2325
24-
:param dt:
25-
:return:
26+
:param dt: YY-MM-DD
2627
"""
2728
result = date.replace('T', ' ')
2829
return result[0:10]
2930

3031
def _get_month_delta(self, date1, date2):
31-
"""
32+
"""get month
3233
33-
:param date1:
34-
:param date2:
35-
:return:
34+
:param date1: YY-MM-DD
35+
:param date2: YY-MM-DD
36+
:return: delta
3637
"""
3738
delta = 0
3839
while True:
39-
mdays = monthrange(date1.year, date1.month)[1]
40-
date1 += timedelta(days=mdays)
40+
mdays = calendar.monthrange(date1.year, date1.month)[1]
41+
date1 += datetime.timedelta(days=mdays)
4142
if date1 <= date2:
4243
delta += 1
4344
else:
4445
break
4546
return delta
4647

4748
def __init__(self, client):
48-
"""
49+
"""init
4950
50-
:param client:
51-
:return:
51+
:param client
52+
:return: billing account info
5253
"""
5354
self.client = client
5455
self.account = self.client['Account']
5556
self.billing_order = self.client['Billing_Order']
5657

5758
def get_info(self):
58-
"""
59+
"""get info
5960
6061
:return: billing account info
6162
"""
6263
result = self.account.getBillingInfo()
6364
return result
6465

6566
def get_balance(self):
66-
"""
67+
"""get balance
6768
6869
:return: billing account info
6970
"""
7071
result = self.account.getBalance()
7172
return result
7273

7374
def get_next_balance(self):
74-
"""
75+
"""get next balance
7576
7677
:return: billing account info
7778
"""
7879
result = self.account.getNextInvoiceTotalAmount()
7980
return result
8081

8182
def get_latest_bill_date(self):
82-
"""
83+
"""get latest balance
8384
8485
:return: billing account info
8586
"""
8687
result = self.account.getLatestBillDate()
8788
return result
8889

8990
def get_next_bill_items(self):
90-
"""
91+
"""get next bill items
9192
9293
:return: billing account info
9394
"""
9495
result = self.account.getAllBillingItems()
9596
return result
9697

9798
def list_resources(self, from_date=None, to_date=None, **kwargs):
98-
""" Retrieve a list of all ordered resources along with their costing.
99+
"""Retrieve a list of all ordered resources along with their costing.
99100
100101
:param dict \\*\\*kwargs: response-level option (limit)
101102
:returns: Returns a list of dictionaries representing the
@@ -110,20 +111,22 @@ def list_resources(self, from_date=None, to_date=None, **kwargs):
110111
])
111112
params['mask'] = "mask[%s]" % ','.join(items)
112113

113-
_filter = NestedDict({})
114+
_filter = utils.NestedDict({})
114115
user = self.account.getCurrentUser(mask='mask[id]')
115-
_filter['orders']['userRecordId'] = query_filter(user['id'])
116+
_filter['orders']['userRecordId'] = utils.query_filter(user['id'])
116117
date_format = '%Y-%m-%d'
117118

118119
if from_date and to_date:
119-
_filter['orders']['createDate'] = query_filter_date(from_date,
120-
to_date)
120+
_filter['orders']['createDate'] = utils.query_filter_date(
121+
from_date, to_date)
121122
elif from_date:
122123
from_date_filter = '>=' + ' ' + from_date
123-
_filter['orders']['createDate'] = query_filter(from_date_filter)
124+
_filter['orders']['createDate'] = utils.query_filter(
125+
from_date_filter)
124126
elif to_date:
125127
to_date_filter = '<=' + ' ' + to_date
126-
_filter['orders']['createDate'] = query_filter(to_date_filter)
128+
_filter['orders']['createDate'] = utils.query_filter(
129+
to_date_filter)
127130
orders = self.account.getOrders(filter=_filter.to_dict())
128131
result = []
129132

@@ -150,28 +153,31 @@ def list_resources(self, from_date=None, to_date=None, **kwargs):
150153
cancellation_date = item['billingItem']['cancellationDate']
151154

152155
if 'hourlyRecurringFee' not in item['billingItem']:
153-
create_date = datetime.strptime(
156+
create_date = datetime.datetime.strptime(
154157
self._format_date(
155158
item['billingItem']['createDate']), date_format)
156159
if cancellation_date:
157-
cancel_date = datetime.strptime(
160+
cancel_date = datetime.datetime.strptime(
158161
self._format_date(
159162
item['billingItem']['cancellationDate']),
160163
date_format)
161164
usedmonths = self._get_month_delta(create_date,
162165
cancel_date)
163166
else:
164-
now = datetime.strptime(
165-
self._format_date(str(datetime.now())),
167+
now = datetime.datetime.strptime(
168+
self._format_date(str(datetime.datetime.now())),
166169
date_format)
167170
usedmonths = self._get_month_delta(create_date, now)
168171

169172
usedmonths += 1
170173

171-
cost += float(billing_order.getOrderTotalOneTime(
172-
id=order['id']) +
173-
billing_order.getOrderTotalRecurring(
174-
id=order['id']) * usedmonths)
174+
cost += float(
175+
billing_order.getOrderTotalOneTime(
176+
id=order['id']
177+
) + billing_order.getOrderTotalRecurring(
178+
id=order['id']
179+
) * usedmonths
180+
)
175181

176182
elif not cancellation_date:
177183
virtual_guest = self.account.getHourlyVirtualGuests(
@@ -187,9 +193,9 @@ def list_resources(self, from_date=None, to_date=None, **kwargs):
187193
['currentHourlyCharge']
188194

189195
else:
190-
create_date = datetime.strptime(
196+
create_date = datetime.datetime.strptime(
191197
self._format_date(creation_date), date_format)
192-
cancel_date = datetime.strptime(
198+
cancel_date = datetime.datetime.strptime(
193199
self._format_date(cancellation_date), date_format)
194200
d1_ts = time.mktime(create_date.timetuple())
195201
d2_ts = time.mktime(cancel_date.timetuple())

‎SoftLayer/utils.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
66
:license: MIT, see LICENSE for more details.
77
"""
8-
import re
98
import datetime
9+
import re
1010

1111
import six
1212

@@ -114,10 +114,10 @@ def query_filter(query):
114114

115115

116116
def query_filter_date(start, end):
117-
"""
117+
"""Query filters given start and end date.
118+
118119
:param start:YY-MM-DD
119120
:param end: YY-MM-DD
120-
:return:
121121
"""
122122
sdate = datetime.datetime.strptime(start, "%Y-%m-%d")
123123
edate = datetime.datetime.strptime(end, "%Y-%m-%d")

0 commit comments

Comments
 (0)