diff options
| author | Gagandeep Singh <gdp.1807@gmail.com> | 2021-11-02 11:28:17 +0530 |
|---|---|---|
| committer | Gagandeep Singh <gdp.1807@gmail.com> | 2021-11-02 11:28:17 +0530 |
| commit | c04509e86e97a69a0b5fcbeebdbec66faad3dbe0 (patch) | |
| tree | b5940db3ad46e55b88d566ec058007dc3c6b7e72 /numpy/lib/_iotools.py | |
| parent | 56647dd47345a7fd24b4ee8d9d52025fcdc3b9ae (diff) | |
| parent | fae6fa47a3cf9b9c64af2f5bd11a3b644b1763d2 (diff) | |
| download | numpy-c04509e86e97a69a0b5fcbeebdbec66faad3dbe0.tar.gz | |
resolved conflicts
Diffstat (limited to 'numpy/lib/_iotools.py')
| -rw-r--r-- | numpy/lib/_iotools.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index a576925d6..4a5ac1285 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -23,8 +23,7 @@ def _decode_line(line, encoding=None): Returns ------- - decoded_line : unicode - Unicode in Python 2, a str (unicode) in Python 3. + decoded_line : str """ if type(line) is bytes: |