in classmethods: class_ -> cls, per Python convention
Merge pull request #4794 from hulu/class_-to-cls

in classmethods: class_ -> cls, per Python convention