8000 Changed how root records resource is accessed on the client object · Stackdriver/twilio-python@2942cd7 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Feb 1, 2018. It is now read-only.

Commit 2942cd7

Browse files
ryanhornryanhorn
committed
Changed how root records resource is accessed on the client object
1 parent 0ec1790 commit 2942cd7

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎tests/test_usage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_records_paging(request):
6262
request.return_value = resp
6363

6464
uri = "%s/Usage/Records" % BASE_URI
65-
usage.records.all.list(
65+
usage.records.list(
6666
start_date="2012-10-12",
6767
end_date="2012-10-13",
6868
category="sms")

‎twilio/rest/resources/usage.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ def load(self, entries):
8383
def uri(self):
8484
return self.__dict__.get('uri')
8585

86-
87-
class UsageRecords(ListResource):
86+
class BaseUsageRecords(ListResource):
8887
name = "Usage/Records"
8988
instance = UsageRecord
9089
key = "usage_records"
@@ -113,31 +112,43 @@ def load_instance(self, data):
113112
return instance
114113

115114

116-
class UsageRecordsDaily(UsageRecords):
115+
class UsageRecords(BaseUsageRecords):
116+
def __init__(self, base_uri, auth):
117+
super(UsageRecords, self).__init__(base_uri, auth)
118+
self.daily = UsageRecordsDaily(base_uri, auth)
119+
self.monthly = UsageRecordsMonthly(base_uri, auth)
120+
self.yearly = UsageRecordsYearly(base_uri, auth)
121+
self.today = UsageRecordsToday(base_uri, auth)
122+
self.yesterday = UsageRecordsYesterday(base_uri, auth)
123+
self.this_month = UsageRecordsThisMonth(base_uri, auth)
124+
self.last_month = UsageRecordsLastMonth(base_uri, auth)
125+
126+
127+
class UsageRecordsDaily(BaseUsageRecords):
117128
name = "Usage/Records/Daily"
118129

119130

120-
class UsageRecordsMonthly(UsageRecords):
131+
class UsageRecordsMonthly(BaseUsageRecords):
121132
name = "Usage/Records/Monthly"
122133

123134

124-
class UsageRecordsYearly(UsageRecords):
135+
class UsageRecordsYearly(BaseUsageRecords):
125136
name = "Usage/Records/Yearly"
126137

127138

128-
class UsageRecordsToday(UsageRecords):
139+
class UsageRecordsToday(BaseUsageRecords):
129140
name = "Usage/Records/Today"
130141

131142

132-
class UsageRecordsYesterday(UsageRecords):
143+
class UsageRecordsYesterday(BaseUsageRecords):
133144
name = "Usage/Records/Yesterday"
134145

135146

136-
class UsageRecordsThisMonth(UsageRecords):
147+
class UsageRecordsThisMonth(BaseUsageRecords):
137148
name = "Usage/Records/ThisMonth"
138149

139150

140-
class UsageRecordsLastMonth(UsageRecords):
151+
class UsageRecordsLastMonth(BaseUsageRecords):
141152
name = "Usage/Records/LastMonth"
142153

143154
UsageRecord.subresources = [
@@ -150,22 +161,11 @@ class UsageRecordsLastMonth(UsageRecords):
150161
UsageRecordsLastMonth
151162
]
152163

153-
class Records(object):
154-
def __init__(self, base_uri, auth):
155-
self.all = UsageRecords(base_uri, auth)
156-
self.daily = UsageRecordsDaily(base_uri, auth)
157-
self.monthly = UsageRecordsMonthly(base_uri, auth)
158-
self.yearly = UsageRecordsYearly(base_uri, auth)
159-
self.today = UsageRecordsToday(base_uri, auth)
160-
self.yesterday = UsageRecordsYesterday(base_uri, auth)
161-
self.this_month = UsageRecordsThisMonth(base_uri, auth)
162-
self.last_month = UsageRecordsLastMonth(base_uri, auth)
163-
164164
class Usage(object):
165165
"""
166166
Holds all the specific Usage list resources
167167
"""
168168

169169
def __init__(self, base_uri, auth):
170-
self.records = Records(base_uri, auth)
170+
self.records = UsageRecords(base_uri, auth)
171171
self.triggers = UsageTriggers(base_uri, auth)

0 commit comments

Comments
 (0)
0