Merge branch 'master' of https://github.com/fvia/pandas into fvia-master

jreback · jreback · commit 4b4c1d5778d4 · 2014-12-03T17:30:11.000-05:00
diff --git a/pandas/tests/test_algos.py b/pandas/tests/test_algos.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pandas.compat import range
 
 import numpy as np
diff --git a/pandas/tests/test_base.py b/pandas/tests/test_base.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 import re
 from datetime import datetime, timedelta
diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable=E1101,E1103,W0232
 
 from datetime import datetime
diff --git a/pandas/tests/test_common.py b/pandas/tests/test_common.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from datetime import datetime
 import re
 
diff --git a/pandas/tests/test_compat.py b/pandas/tests/test_compat.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Testing that functions from compat work as expected
 """
diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 # pylint: disable-msg=W0612,E1101
 
diff --git a/pandas/tests/test_format.py b/pandas/tests/test_format.py
@@ -1,5 +1,5 @@
-from __future__ import print_function
 # -*- coding: utf-8 -*-
+from __future__ import print_function
 import re
 
 from pandas.compat import range, zip, lrange, StringIO, PY3, lzip, u
diff --git a/pandas/tests/test_generic.py b/pandas/tests/test_generic.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable-msg=E1101,W0612
 
 from datetime import datetime, timedelta
diff --git a/pandas/tests/test_groupby.py b/pandas/tests/test_groupby.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import print_function
 import nose
 
diff --git a/pandas/tests/test_index.py b/pandas/tests/test_index.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable=E1101,E1103,W0232
 
 from datetime import datetime, timedelta
diff --git a/pandas/tests/test_indexing.py b/pandas/tests/test_indexing.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable-msg=W0612,E1101
 import sys
 import nose
diff --git a/pandas/tests/test_internals.py b/pandas/tests/test_internals.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable=W0102
 
 import nose
diff --git a/pandas/tests/test_lib.py b/pandas/tests/test_lib.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from datetime import datetime, timedelta, date, time
 
 import numpy as np
diff --git a/pandas/tests/test_multilevel.py b/pandas/tests/test_multilevel.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable-msg=W0612,E1101,W0141
 import datetime
 import itertools
diff --git a/pandas/tests/test_nanops.py b/pandas/tests/test_nanops.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import division, print_function
 
 from functools import partial
diff --git a/pandas/tests/test_panel.py b/pandas/tests/test_panel.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable=W0612,E1101
 
 from datetime import datetime
diff --git a/pandas/tests/test_panel4d.py b/pandas/tests/test_panel4d.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from datetime import datetime
 from pandas.compat import range, lrange
 import os
diff --git a/pandas/tests/test_panelnd.py b/pandas/tests/test_panelnd.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from datetime import datetime
 import os
 import operator
diff --git a/pandas/tests/test_reshape.py b/pandas/tests/test_reshape.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable-msg=W0612,E1101
 from copy import deepcopy
 from datetime import datetime, timedelta
diff --git a/pandas/tests/test_rplot.py b/pandas/tests/test_rplot.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pandas.compat import range
 import pandas.tools.rplot as rplot
 import pandas.util.testing as tm
diff --git a/pandas/tests/test_stats.py b/pandas/tests/test_stats.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from pandas import compat
 import nose
 
diff --git a/pandas/tests/test_strings.py b/pandas/tests/test_strings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # pylint: disable-msg=E1101,W0612
 
 from datetime import datetime, timedelta, date
diff --git a/pandas/tests/test_tseries.py b/pandas/tests/test_tseries.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 import nose
 from numpy import nan
 import numpy as np
diff --git a/pandas/tests/test_util.py b/pandas/tests/test_util.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 import warnings
 
 import nose

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`from pandas.compat import range`
`2`	`3`
`3`	`4`	`import numpy as np`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`from __future__ import print_function`
`2`	`3`	`import re`
`3`	`4`	`from datetime import datetime, timedelta`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`# pylint: disable=E1101,E1103,W0232`
`2`	`3`
`3`	`4`	`from datetime import datetime`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`"""`
`2`	`3`	`Testing that functions from compat work as expected`
`3`	`4`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# -- coding: utf-8 --`
`1`	`2`	`# pylint: disable-msg=E1101,W0612`
`2`	`3`
`3`	`4`	`from datetime import datetime, timedelta`