Skip to content

Commit a403813

Browse files
author
Matt Bernier
authored
Merge pull request sendgrid#484 from gabrielkrell/not-java
Python style fixes
2 parents 4ae3c96 + d94fdb6 commit a403813

20 files changed

Lines changed: 79 additions & 205 deletions

‎sendgrid/helpers/mail/asm.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ def __init__(self, group_id=None, groups_to_display=None):
99
:param groups_to_display: Unsubscribe groups to display
1010
:type groups_to_display: list(int), optional
1111
"""
12-
self._group_id = None
13-
self._groups_to_display = None
14-
15-
if group_id is not None:
16-
self._group_id = group_id
17-
18-
if groups_to_display is not None:
19-
self._groups_to_display = groups_to_display
12+
self.group_id = group_id
13+
self.groups_to_display = groups_to_display
2014

2115
@property
2216
def group_id(self):

‎sendgrid/helpers/mail/bcc_settings.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,8 @@ def __init__(self, enable=None, email=None):
1313
:param email: Who should be BCCed.
1414
:type email: Email, optional
1515
"""
16-
self._enable = None
17-
self._email = None
18-
19-
if enable is not None:
20-
self.enable = enable
21-
22-
if email is not None:
23-
self.email = email
16+
self.enable = enable
17+
self.email = email
2418

2519
@property
2620
def enable(self):

‎sendgrid/helpers/mail/bypass_list_management.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ def __init__(self, enable=None):
1313
:param enable: Whether emails should bypass list management.
1414
:type enable: boolean, optional
1515
"""
16-
self._enable = None
17-
18-
if enable is not None:
19-
self.enable = enable
16+
self.enable = enable
2017

2118
@property
2219
def enable(self):

‎sendgrid/helpers/mail/category.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ def __init__(self, name=None):
77
:param name: The name of this category
88
:type name: string, optional
99
"""
10-
self._name = None
11-
if name is not None:
12-
self._name = name
10+
self.name = name
1311

1412
@property
1513
def name(self):

‎sendgrid/helpers/mail/click_tracking.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ def __init__(self, enable=None, enable_text=None):
99
:param enable_text: If click tracking is on in your email's text/plain.
1010
:type enable_text: boolean, optional
1111
"""
12-
self._enable = None
13-
self._enable_text = None
14-
15-
if enable is not None:
16-
self.enable = enable
17-
18-
if enable_text is not None:
19-
self.enable_text = enable_text
12+
self.enable = enable
13+
self.enable_text = enable_text
2014

2115
@property
2216
def enable(self):

‎sendgrid/helpers/mail/content.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@ def __init__(self, type_=None, value=None):
1212
:param value: The actual content.
1313
:type value: string, optional
1414
"""
15-
self._type = None
16-
self._value = None
17-
18-
if type_ is not None:
19-
self.type = type_
20-
21-
if value is not None:
22-
self.value = value
15+
self.type = type_
16+
self.value = value
2317

2418
@property
2519
def type(self):

‎sendgrid/helpers/mail/custom_arg.py‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@ class CustomArg(object):
99

1010
def __init__(self, key=None, value=None):
1111
"""Create a CustomArg with the given key and value."""
12-
self._key = None
13-
self._value = None
14-
15-
if key is not None:
16-
self.key = key
17-
18-
if value is not None:
19-
self.value = value
12+
self.key = key
13+
self.value = value
2014

2115
@property
2216
def key(self):

‎sendgrid/helpers/mail/email.py‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
try:
2+
import rfc822
3+
except ImportError:
4+
import email.utils as rfc822
5+
6+
17
class Email(object):
28
"""An email address with an optional name."""
39

@@ -11,17 +17,13 @@ def __init__(self, email=None, name=None):
1117
:param name: Name for this sender or recipient.
1218
:type name: string
1319
"""
14-
self._name = None
15-
self._email = None
16-
if name or email:
17-
if not name:
18-
# allows passing emails as "dude Fella <example@example.com>"
19-
self.parse_email(email)
20-
else:
21-
# allows backwards compatibility for Email(email, name)
22-
if email is not None:
23-
self.email = email
24-
self.name = name
20+
if email and not name:
21+
# allows passing emails as "dude Fella <example@example.com>"
22+
self.parse_email(email)
23+
else:
24+
# allows backwards compatibility for Email(email, name)
25+
self.email = email
26+
self.name = name
2527

2628
@property
2729
def name(self):
@@ -65,11 +67,6 @@ def get(self):
6567
return email
6668

6769
def parse_email(self, email_info):
68-
try:
69-
import rfc822
70-
except ImportError:
71-
import email.utils as rfc822
72-
7370
name, email = rfc822.parseaddr(email_info)
7471

7572
# more than likely a string was passed here instead of an email address

‎sendgrid/helpers/mail/footer_settings.py‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,9 @@ def __init__(self, enable=None, text=None, html=None):
1111
:param html: HTML content of this footer
1212
:type html: string, optional
1313
"""
14-
self._enable = None
15-
self._text = None
16-
self._html = None
17-
18-
if enable is not None:
19-
self.enable = enable
20-
21-
if text is not None:
22-
self.text = text
23-
24-
if html is not None:
25-
self.html = html
14+
self.enable = enable
15+
self.text = text
16+
self.html = html
2617

2718
@property
2819
def enable(self):

‎sendgrid/helpers/mail/ganalytics.py‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,12 @@ def __init__(self,
2323
:param utm_campaign: The name of the campaign.
2424
:type utm_campaign: string, optional
2525
"""
26-
self._enable = None
27-
self._utm_source = None
28-
self._utm_medium = None
29-
self._utm_term = None
30-
self._utm_content = None
31-
self._utm_campaign = None
32-
33-
if enable is not None:
34-
self.enable = enable
35-
if utm_source is not None:
36-
self.utm_source = utm_source
37-
if utm_medium is not None:
38-
self.utm_medium = utm_medium
39-
if utm_term is not None:
40-
self.utm_term = utm_term
41-
if utm_content is not None:
42-
self.utm_content = utm_content
43-
if utm_campaign is not None:
44-
self.utm_campaign = utm_campaign
26+
self.enable = enable
27+
self.utm_source = utm_source
28+
self.utm_medium = utm_medium
29+
self.utm_term = utm_term
30+
self.utm_content = utm_content
31+
self.utm_campaign = utm_campaign
4532

4633
@property
4734
def enable(self):

0 commit comments

Comments
 (0)