use method_decorator (bug 971330)
Merge pull request #396 from andymckay/971330

use method_decorator (bug 971330)