BUG: fix python3 issues

pandas-dev · Nov 20, 2012 · 61766ec · 61766ec
1 parent 57753d5
commit 61766ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/RELEASE.rst b/RELEASE.rst
@@ -41,6 +41,7 @@ pandas 0.10.0
 **Improvements to existing features**
 
   - Grouped histogram via `by` keyword in Series/DataFrame.hist (#2186)
+  - Add ``nrows`` option to DataFrame.from_records for iterators (#1794)
 
 **Bug fixes**
 

diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -911,7 +911,10 @@ def from_records(cls, data, index=None, exclude=None, columns=None,
                 return DataFrame()
 
             try:
-                first_row = data.next()
+                if py3compat.PY3:
+                    first_row = next(data)
+                else:
+                    first_row = data.next()
             except StopIteration:
                 return DataFrame(index=index, columns=columns)
 

diff --git a/pandas/tests/test_strings.py b/pandas/tests/test_strings.py
@@ -710,10 +710,10 @@ def test_encode_decode_errors(self):
         exp = encodeBase.map(f)
         tm.assert_series_equal(result, exp)
 
-        decodeBase = Series(['a', 'b', 'a\x9d'])
+        decodeBase = Series([b'a', b'b', b'a\x9d'])
 
         self.assertRaises(UnicodeDecodeError,
-                          decodeBase.str.encode, 'cp1252')
+                          decodeBase.str.decode, 'cp1252')
 
         f = lambda x: x.decode('cp1252', 'ignore')
         result = decodeBase.str.decode('cp1252', 'ignore')