8000 Fix merge conflicts · meego/twilio-python@4885376 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4885376

Browse files
committed
Fix merge conflicts
2 parents 02c60e7 + a21058a commit 4885376

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

twilio/rest/resources.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,15 @@ def transform_params(p):
2727
"""
2828
Transform parameters, throwing away any None values
2929
and convert False and True values to strings
30+
31+
Ex:
32+
{"record": true, "date_created": "2012-01-02"}
33+
34+
becomes:
35+
{"Record": "true", "DateCreated": "2012-01-02"}
3036
"""
31-
p = [(format_name(d), convert_boolean(p[d])) for d in p if p[d] is not None]
37+
p = [(format_name(d),
38+
convert_boolean(p[d])) for d in p if p[d] is not None]
3239
return dict(p)
3340

3441

@@ -60,7 +67,10 @@ def convert_boolean(boolean):
6067

6168
def convert_case(s):
6269
"""
63-
Given a string in snake case, conver to CamelCase
70+
Given a string in snake case, convert to CamelCase
71+
72+
Ex:
73+
date_created -> DateCreated
6474
"""
6575
return ''.join([a.title() for a in s.split("_") if a])
6676

@@ -496,7 +506,7 @@ class Notifications(ListResource):
496506
def list(self, before=None, after=None, **kwargs):
497507
"""
498508
Returns a page of :class:`Notification` resources as a list.
499-
For paging informtion see :class:`ListResource`.
509+
For paging information see :class:`ListResource`.
500510
501511
**NOTE**: Due to the potentially voluminous amount of data in a
502512
notification, the full HTTP request and response data is only returned
@@ -523,15 +533,15 @@ class ConnectApp(InstanceResource):
523533

524534

525535
class ConnectApps(ListResource):
526-
""" A list of Call resources """
536+
""" A list of Connect App resources """
527537

528538
name = "ConnectApps"
529539
instance = ConnectApp
530540
key = "connect_apps"
531541

532542
def list(self, **kwargs):
533543
"""
534-
Returns a page of :class:`Call` resources as a list. For paging
544+
Returns a page of :class:`ConnectApp` resources as a list. For paging
535545
informtion see :class:`ListResource`
536546
"""
537547
return self.get_instances(kwargs)
@@ -554,7 +564,7 @@ def load(self, entries):
554564

555565

556566
class AuthorizedConnectApps(ConnectApps):
557-
""" A list of Call resources """
567+
""" A list of Authorized Connect App resources """
558568

559569
name = "AuthorizedConnectApps"
560570
instance = AuthorizedConnectApp
@@ -621,7 +631,7 @@ def list(self, from_=None, ended_after=None,
621631
:param date before: Only list calls started before this datetime
622632
"""
623633
kwargs["from"] = from_
624-
kwargs["StartTime<"] = started_before
634+
kwargs["StartTime<"] = started_before
625635
kwargs["StartTime>"] = started_after
626636
kwargs["StartTime"] = parse_date(started)
627637
kwargs["EndTime<"] = ended_before
@@ -736,7 +746,7 @@ def update(self, sid, **kwargs):
736746

737747
def validate(self, phone_number, **kwargs):
738748
"""
739-
Begin the validation procress for the given number.
749+
Begin the validation process for the given number.
740750
741751
Returns a dictionary with the following keys
742752
@@ -994,8 +1004,8 @@ def list(self, **kwargs):
9941004
"""
9951005
return self.get_instances(kwargs)
9961006

997-
def update(self, sid, url=None, method=None,
998-
fallback_url=None, fallback_method=None):
1007+
def update(self, sid, url=None, method=None, fallback_url=None,
1008+
fallback_method=None, **kwargs):
9991009
"""
10001010
Update a specific :class:`ShortCode`, by specifying the sid.
10011011
@@ -1200,7 +1210,7 @@ def create(self, **kwargs):
12001210
"""
12011211
return self.create_instance(kwargs)
12021212

1203-
def update(self, sid, **kwargs):
1213+
def update(self, sid, **kwargs):
12041214
"""
12051215
Update an :class:`Application` with the given parameters.
12061216

0 commit comments

Comments
 (0)
0