@@ -64,18 +64,12 @@ def setUp(self):
64
64
@tm .network
65
65
def test_parse_public_s3_bucket (self ):
66
66
for ext , comp in [('' , None ), ('.gz' , 'gzip' ), ('.bz2' , 'bz2' )]:
67
- if comp == 'bz2' and compat .PY2 :
68
- # The Python 2 C parser can't read bz2 from S3.
69
- self .assertRaises (ValueError , read_csv ,
70
- 's3://pandas-test/tips.csv' + ext ,
71
- compression = comp )
72
- else :
73
- df = read_csv ('s3://pandas-test/tips.csv' +
74
- ext , compression = comp )
75
- self .assertTrue (isinstance (df , DataFrame ))
76
- self .assertFalse (df .empty )
77
- tm .assert_frame_equal (read_csv (
78
- tm .get_data_path ('tips.csv' )), df )
67
+ df = read_csv ('s3://pandas-test/tips.csv' +
68
+ ext , compression = comp )
69
+ self .assertTrue (isinstance (df , DataFrame ))
70
+ self .assertFalse (df .empty )
71
+ tm .assert_frame_equal (read_csv (
72
+ tm .get_data_path ('tips.csv' )), df )
79
73
80
74
# Read public file from bucket with not-public contents
81
75
df = read_csv ('s3://cant_get_it/tips.csv' )
@@ -104,43 +98,31 @@ def test_parse_public_s3a_bucket(self):
104
98
@tm .network
105
99
def test_parse_public_s3_bucket_nrows (self ):
106
100
for ext , comp in [('' , None ), ('.gz' , 'gzip' ), ('.bz2' , 'bz2' )]:
107
- if comp == 'bz2' and compat .PY2 :
108
- # The Python 2 C parser can't read bz2 from S3.
109
- self .assertRaises (ValueError , read_csv ,
110
- 's3://pandas-test/tips.csv' + ext ,
111
- compression = comp )
112
- else :
113
- df = read_csv ('s3://pandas-test/tips.csv' +
114
- ext , nrows = 10 , compression = comp )
115
- self .assertTrue (isinstance (df , DataFrame ))
116
- self .assertFalse (df .empty )
117
- tm .assert_frame_equal (read_csv (
118
- tm .get_data_path ('tips.csv' )).iloc [:10 ], df )
101
+ df = read_csv ('s3://pandas-test/tips.csv' +
102
+ ext , nrows = 10 , compression = comp )
103
+ self .assertTrue (isinstance (df , DataFrame ))
104
+ self .assertFalse (df .empty )
105
+ tm .assert_frame_equal (read_csv (
106
+ tm .get_data_path ('tips.csv' )).iloc [:10 ], df )
119
107
120
108
@tm .network
121
109
def test_parse_public_s3_bucket_chunked (self ):
122
110
# Read with a chunksize
123
111
chunksize = 5
124
112
local_tips = read_csv (tm .get_data_path ('tips.csv' ))
125
113
for ext , comp in [('' , None ), ('.gz' , 'gzip' ), ('.bz2' , 'bz2' )]:
126
- if comp == 'bz2' and compat .PY2 :
127
- # The Python 2 C parser can't read bz2 from S3.
128
- self .assertRaises (ValueError , read_csv ,
129
- 's3://pandas-test/tips.csv' + ext ,
130
- compression = comp )
131
- else :
132
- df_reader = read_csv ('s3://pandas-test/tips.csv' + ext ,
133
- chunksize = chunksize , compression = comp )
134
- self .assertEqual (df_reader .chunksize , chunksize )
135
- for i_chunk in [0 , 1 , 2 ]:
136
- # Read a couple of chunks and make sure we see them
137
- # properly.
138
- df = df_reader .get_chunk ()
139
- self .assertTrue (isinstance (df , DataFrame ))
140
- self .assertFalse (df .empty )
141
- true_df = local_tips .iloc [
142
- chunksize * i_chunk : chunksize * (i_chunk + 1 )]
143
- tm .assert_frame_equal (true_df , df )
114
+ df_reader = read_csv ('s3://pandas-test/tips.csv' + ext ,
115
+ chunksize = chunksize , compression = comp )
116
+ self .assertEqual (df_reader .chunksize , chunksize )
117
+ for i_chunk in [0 , 1 , 2 ]:
118
+ # Read a couple of chunks and make sure we see them
119
+ # properly.
120
+ df = df_reader .get_chunk ()
121
+ self .assertTrue (isinstance (df , DataFrame ))
122
+ self .assertFalse (df .empty )
123
+ true_df = local_tips .iloc [
124
+ chunksize * i_chunk : chunksize * (i_chunk + 1 )]
125
+ tm .assert_frame_equal (true_df , df )
144
126
145
127
@tm .network
146
128
def test_parse_public_s3_bucket_chunked_python (self ):
0 commit comments