Skip to content

Commit cb46662

Browse files
committed
Avoid using six.PY2; fixes #48. (Thanks to Yaroslav Halchenko.)
1 parent 3e71804 commit cb46662

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

patsy/test_build.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,15 +682,19 @@ def t(which_terms, variables, columns):
682682

683683
t("~ 0 + x + y + z", ["x", "y", "z"], slice(None))
684684
t(["x", "y", "z"], ["x", "y", "z"], slice(None))
685-
if six.PY2:
685+
# Compatibility: six.PY2 wasn't added until 1.4.0, but six.PY3 exists in
686+
# all versions.
687+
if not six.PY3:
686688
t([unicode("x"), unicode("y"), unicode("z")],
687689
["x", "y", "z"], slice(None))
688690
t(all_terms, ["x", "y", "z"], slice(None))
689691
t([all_terms[0], "y", all_terms[2]], ["x", "y", "z"], slice(None))
690692

691693
t("~ 0 + x + z", ["x", "z"], [0, 3])
692694
t(["x", "z"], ["x", "z"], [0, 3])
693-
if six.PY2:
695+
# Compatibility: six.PY2 wasn't added until 1.4.0, but six.PY3 exists in
696+
# all versions.
697+
if not six.PY3:
694698
t([unicode("x"), unicode("z")], ["x", "z"], [0, 3])
695699
t([all_terms[0], all_terms[2]], ["x", "z"], [0, 3])
696700
t([all_terms[0], "z"], ["x", "z"], [0, 3])

0 commit comments

Comments
 (0)