Author: Brian Kearns <bdkea...@gmail.com> Branch: Changeset: r73584:201000b16c85 Date: 2014-09-17 15:51 -0400 http://bitbucket.org/pypy/pypy/changeset/201000b16c85/
Log: merge heads diff --git a/pypy/module/operator/app_operator.py b/pypy/module/operator/app_operator.py --- a/pypy/module/operator/app_operator.py +++ b/pypy/module/operator/app_operator.py @@ -4,7 +4,6 @@ This module exports a set of operators as functions. E.g. operator.add(x,y) is equivalent to x+y. ''' -from __pypy__ import builtinify import types _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
