Skip to content

Commit

Permalink
changed newline default
Browse files Browse the repository at this point in the history
  • Loading branch information
willmcgugan committed Dec 6, 2016
1 parent 108126d commit 05dbb25
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions fs/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def appendtext(self,
text,
encoding='utf-8',
errors=None,
newline=None):
newline=''):
"""
Append text to a file. Creating the file if it doesn't already
exists.
Expand Down Expand Up @@ -461,7 +461,7 @@ def getbytes(self, path):
contents = read_file.read()
return contents

def gettext(self, path, encoding=None, errors=None, newline=None):
def gettext(self, path, encoding=None, errors=None, newline=''):
"""
Get the contents of a file as a string.
Expand Down Expand Up @@ -820,7 +820,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
**options):
"""
Open a file.
Expand Down Expand Up @@ -1041,7 +1041,7 @@ def settext(self,
contents,
encoding='utf-8',
errors=None,
newline=None):
newline=''):
"""
Create or replace a file with text.
Expand Down
2 changes: 1 addition & 1 deletion fs/iotools.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def make_stream(name,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
line_buffering=False,
**kwargs):
"""Take a Python 2.x binary file and return an IO Stream."""
Expand Down
4 changes: 2 additions & 2 deletions fs/mountfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
**options):
validate_open_mode(mode)
self.check()
Expand Down Expand Up @@ -237,7 +237,7 @@ def settext(self,
contents,
encoding='utf-8',
errors=None,
newline=None):
newline=''):
fs, _path = self._delegate(path)
return fs.settext(
_path,
Expand Down
6 changes: 3 additions & 3 deletions fs/multifs.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def getbytes(self, path):
raise errors.ResourceNotFound(path)
return fs.getbytes(path)

def gettext(self, path, encoding=None, errors=None, newline=None):
def gettext(self, path, encoding=None, errors=None, newline=''):
self.check()
fs = self._delegate_required(path)
return fs.gettext(
Expand Down Expand Up @@ -316,7 +316,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
**kwargs):
self.check()
if check_writable(mode):
Expand Down Expand Up @@ -347,7 +347,7 @@ def settext(self,
contents,
encoding='utf-8',
errors=None,
newline=None):
newline=''):
self._require_writable(path)
return self.write_fs.settext(
path,
Expand Down
4 changes: 2 additions & 2 deletions fs/osfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
line_buffering=False,
**options):
_mode = Mode(mode)
Expand All @@ -326,7 +326,7 @@ def open(self,
buffering=buffering,
encoding=None if _mode.binary else _encoding,
errors=errors,
newline=newline,
newline=None if _mode.binary else newline,
**options
)

Expand Down
8 changes: 4 additions & 4 deletions fs/wrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def appendbytes(self, path, data):
raise ResourceReadOnly(path)

def appendtext(self, path, text,
encoding='utf-8', errors=None, newline=None):
encoding='utf-8', errors=None, newline=''):
self.check()
raise ResourceReadOnly(path)

Expand Down Expand Up @@ -151,7 +151,7 @@ def settext(self,
contents,
encoding='utf-8',
errors=None,
newline=None):
newline=''):
self.check()
raise ResourceReadOnly(path)

Expand All @@ -177,7 +177,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
line_buffering=False,
**options):
self.check()
Expand Down Expand Up @@ -207,7 +207,7 @@ def setfile(self,
file,
encoding=None,
errors=None,
newline=None):
newline=''):
self.check()
raise ResourceReadOnly(path)

Expand Down
8 changes: 4 additions & 4 deletions fs/wrapfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def appendbytes(self, path, data):
return _fs.appendbytes(_path, data)

def appendtext(self, path, text,
encoding='utf-8', errors=None, newline=None):
encoding='utf-8', errors=None, newline=''):
self.check()
_fs, _path = self.delegate_path(path)
with unwrap_errors(path):
Expand Down Expand Up @@ -241,7 +241,7 @@ def getbytes(self, path):
_bytes = _fs.getbytes(_path)
return _bytes

def gettext(self, path, encoding=None, errors=None, newline=None):
def gettext(self, path, encoding=None, errors=None, newline=''):
self.check()
_fs, _path = self.delegate_path(path)
with unwrap_errors(path):
Expand Down Expand Up @@ -326,7 +326,7 @@ def open(self,
buffering=-1,
encoding=None,
errors=None,
newline=None,
newline='',
line_buffering=False,
**options):
self.check()
Expand Down Expand Up @@ -370,7 +370,7 @@ def setfile(self,
file,
encoding=None,
errors=None,
newline=None):
newline=''):
self.check()
_fs, _path = self.delegate_path(path)
with unwrap_errors(path):
Expand Down

0 comments on commit 05dbb25

Please sign in to comment.