SIGN IN SIGN UP

Update merge from 2.7: s/basetring/str

B
Barry Warsaw committed
2dceb359cb0353d4f327fc36be27e67a3e94566e
Parent: eaae1b7