Code review formatting and compliance. Also use for testing

Author: Kevin Kuhl

ci/requirements-2.7.pip

@@ -8,4 +8,3 @@ py
 PyCrypto
 mock
 ipython
-moto

ci/requirements-3.6.pip

@@ -1,2 +1 @@
 brotlipy
-moto

ci/requirements-3.6.run

@@ -22,4 +22,4 @@ fastparquet
 beautifulsoup4
 s3fs
 xarray
-ipython
+ipython

ci/requirements-3.6_LOCALE.run

@@ -19,4 +19,4 @@ psycopg2
 beautifulsoup4
 s3fs
 xarray
-ipython
+ipython

ci/requirements-3.6_LOCALE_SLOW.run

@@ -19,4 +19,4 @@ psycopg2
 beautifulsoup4
 s3fs
 xarray
-ipython
+ipython

pandas/io/json/json.py

@@ -349,8 +349,7 @@ def read_json(path_or_buf=None, orient=None, typ='frame', dtype=True,
         # commas and put it in a json list to make a valid json object.
 
         """
-            Handle encoded bytes arrays in PY3 and bytes objects from certain
-            readables before using StringIO.
+            If PY3 and/or isinstance(json, bytes)
         """
         if isinstance(json, bytes):
             json = json.decode('utf-8')

pandas/tests/io/json/test_pandas.py

@@ -4,7 +4,10 @@
 from pandas.compat import (range, lrange, StringIO,
                            OrderedDict, is_platform_32bit)
 import os
+import moto
 import numpy as np
+from pandas.tests.io.parser.test_network import s3_resource
+from pandas.tests.io.parser.test_network import tips_file, jsonl_file
 from pandas import (Series, DataFrame, DatetimeIndex, Timestamp,
                     read_json, compat)
 from datetime import timedelta
@@ -990,34 +993,11 @@ def test_read_inline_jsonl(self):
         expected = DataFrame([[1, 2], [1, 2]], columns=['a', 'b'])
         assert_frame_equal(result, expected)
 
-    @pytest.yield_fixture(scope="function")
-    def testbucket_conn(self):
-        """ Fixture for test_read_s3_jsonl"""
-        boto3 = pytest.importorskip('boto3')
-        moto = pytest.importorskip("moto")
-
-        """
-        Start and stop mocking only once, surrounding the test run
-        to ensure single context is kept.
-        """
-        moto.mock_s3().start()
-
-        conn = boto3.client('s3')
-        conn.create_bucket(Bucket='testbucket')
-        yield conn
-
-        moto.mock_s3().stop()
-
-    def test_read_s3_jsonl(self, testbucket_conn):
+    def test_read_s3_jsonl(self, s3_resource):
         pytest.importorskip('s3fs')
         # GH17200
 
-        body = b'{"a": 1, "b": 2}\n{"b":2, "a" :1}\n'
-        testbucket_conn.put_object(Body=body,
-                                   Key='items.jsonl',
-                                   Bucket='testbucket')
-
-        result = read_json('s3://testbucket/items.jsonl', lines=True)
+        result = read_json('s3n://pandas-test/items.jsonl', lines=True)
         expected = DataFrame([[1, 2], [1, 2]], columns=['a', 'b'])
         assert_frame_equal(result, expected)
 

pandas/tests/io/parser/data/items.jsonl

@@ -0,0 +1,2 @@
+{"a": 1, "b": 2}
+{"b":2, "a" :1}

pandas/tests/io/parser/test_network.py

@@ -19,6 +19,9 @@
 def tips_file():
     return os.path.join(tm.get_data_path(), 'tips.csv')
 
+@pytest.fixture(scope='module')
+def jsonl_file():
+    return os.path.join(tm.get_data_path(), 'items.jsonl')
 
 @pytest.fixture(scope='module')
 def salaries_table():
@@ -27,14 +30,15 @@ def salaries_table():
 
 
 @pytest.fixture(scope='module')
-def s3_resource(tips_file):
+def s3_resource(tips_file, jsonl_file):
     pytest.importorskip('s3fs')
     moto.mock_s3().start()
 
     test_s3_files = [
         ('tips.csv', tips_file),
         ('tips.csv.gz', tips_file + '.gz'),
         ('tips.csv.bz2', tips_file + '.bz2'),
+        ('items.jsonl', jsonl_file),
     ]
 
     def add_tips_files(bucket_name):