Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide utf-8 as encoding explicitly when opening text files #414

Merged
merged 4 commits into from
May 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions register.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import pypandoc
from io import open

output = pypandoc.convert('README.md', 'rst')
with open('README.txt' 'w+') as f:
f.write(str(output.encode('utf-8')))

readme_rst = open('./README.txt').read()
readme_rst = open('./README.txt', 'r', encoding='utf-8').read()
replace = '''
.. figure:: https://uiux.s3.amazonaws.com/2016-logos/email-logo
%402x.png\n :alt: SendGrid Logo\n\n SendGrid Logo\n
Expand All @@ -15,5 +16,5 @@
\n :target: https://www.sendgrid.com
'''
final_text = readme_rst.replace(replace, replacement)
with open('./README.txt', 'w') as f:
f.write(final_text)
with open('./README.txt', 'w', encoding='utf-8') as f:
f.write(final_text)
7 changes: 4 additions & 3 deletions sendgrid/helpers/inbound/send.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Usage: ./send.py [path to file containing test data]"""
import argparse
import sys
from io import open
try:
from config import Config
except ImportError:
Expand All @@ -26,9 +27,9 @@ def test_payload(self, payload_filepath):
"Content-Type": "multipart/form-data; boundary=xYzZY"
}
client = Client(host=self.url, request_headers=headers)
with open(payload_filepath, 'r') as f:
data = f.read()
return client.post(request_body=data)
f = open(payload_filepath, 'r', encoding='utf-8')
data = f.read()
return client.post(request_body=data)

@property
def url(self):
Expand Down
10 changes: 8 additions & 2 deletions sendgrid/helpers/mail/asm.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ def __init__(self, group_id=None, groups_to_display=None):
:param groups_to_display: Unsubscribe groups to display
:type groups_to_display: list(int), optional
"""
self.group_id = group_id
self.groups_to_display = groups_to_display
self._group_id = None
self._groups_to_display = None

if group_id is not None:
self.group_id = group_id

if groups_to_display is not None:
self.groups_to_display = groups_to_display

@property
def group_id(self):
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import sys
import os
from io import open
from setuptools import setup, find_packages

__version__ = None
Expand All @@ -8,7 +9,7 @@

long_description = 'Please see our GitHub README'
if os.path.exists('README.txt'):
long_description = open('README.txt').read()
long_description = open('README.txt', 'r', encoding='utf-8').read()


def getRequires():
Expand Down