graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2025-04-25 03:43:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add pyupgrade pre-commit hook and run on all files (#736)

Browse Source
This commit is contained in:
Dan 2018-06-09 06:01:29 -07:00 committed by Jonathan Kim
parent 1b3e7f3b96
commit 12ee52a13a
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.pre-commit-config.yaml
View File

@ -17,6 +17,10 @@ repos:
args: args:
- --autofix - --autofix
- id: flake8 - id: flake8
- repo: https://github.com/asottile/pyupgrade
rev: v1.2.0
hooks:
- id: pyupgrade
- repo: https://github.com/asottile/seed-isort-config - repo: https://github.com/asottile/seed-isort-config
rev: v1.0.0 rev: v1.0.0
hooks: hooks:

8
graphene/pyutils/enum.py
View File

@ -170,7 +170,7 @@ class EnumMeta(type):
first_enum) first_enum)
# save enum items into separate mapping so they don't get baked into # save enum items into separate mapping so they don't get baked into
# the new class # the new class
members = dict((k, classdict[k]) for k in classdict._member_names) members = {k: classdict[k] for k in classdict._member_names}
for name in classdict._member_names: for name in classdict._member_names:
del classdict[name] del classdict[name]
@ -192,14 +192,14 @@ class EnumMeta(type):
_order_ += aliases _order_ += aliases
# check for illegal enum names (any others?) # check for illegal enum names (any others?)
invalid_names = set(members) & set(['mro']) invalid_names = set(members) & {'mro'}
if invalid_names: if invalid_names:
raise ValueError('Invalid enum member name(s): %s' % ( raise ValueError('Invalid enum member name(s): %s' % (
', '.join(invalid_names), )) ', '.join(invalid_names), ))
# save attributes from super classes so we know if we can take # save attributes from super classes so we know if we can take
# the shortcut of storing members in the class dict # the shortcut of storing members in the class dict
base_attributes = set([a for b in bases for a in b.__dict__]) base_attributes = {a for b in bases for a in b.__dict__}
# create our new Enum type # create our new Enum type
enum_class = super(EnumMeta, metacls).__new__(metacls, cls, bases, classdict) enum_class = super(EnumMeta, metacls).__new__(metacls, cls, bases, classdict)
enum_class._member_names_ = [] # names in random order enum_class._member_names_ = [] # names in random order
@ -831,7 +831,7 @@ def _convert(cls, name, module, filter, source=None):
source = vars(source) source = vars(source)
else: else:
source = module_globals source = module_globals
members = dict((name, value) for name, value in source.items() if filter(name)) members = {name: value for name, value in source.items() if filter(name)}
cls = cls(name, members, module=module) cls = cls(name, members, module=module)
cls.__reduce_ex__ = _reduce_ex_by_name cls.__reduce_ex__ = _reduce_ex_by_name
module_globals.update(cls.__members__) module_globals.update(cls.__members__)

40
graphene/pyutils/signature.py
View File

@ -52,7 +52,7 @@ def signature(obj):
'''Get a signature object for the passed callable.''' '''Get a signature object for the passed callable.'''
if not callable(obj): if not callable(obj):
raise TypeError('{0!r} is not a callable object'.format(obj)) raise TypeError('{!r} is not a callable object'.format(obj))
if isinstance(obj, types.MethodType): if isinstance(obj, types.MethodType):
sig = signature(obj.__func__) sig = signature(obj.__func__)
@ -99,7 +99,7 @@ def signature(obj):
try: try:
ba = sig.bind_partial(*partial_args, **partial_keywords) ba = sig.bind_partial(*partial_args, **partial_keywords)
except TypeError as ex: except TypeError as ex:
msg = 'partial object {0!r} has incorrect arguments'.format(obj) msg = 'partial object {!r} has incorrect arguments'.format(obj)
raise ValueError(msg) raise ValueError(msg)
for arg_name, arg_value in ba.arguments.items(): for arg_name, arg_value in ba.arguments.items():
@ -166,10 +166,10 @@ def signature(obj):
if isinstance(obj, types.BuiltinFunctionType): if isinstance(obj, types.BuiltinFunctionType):
# Raise a nicer error message for builtins # Raise a nicer error message for builtins
msg = 'no signature found for builtin function {0!r}'.format(obj) msg = 'no signature found for builtin function {!r}'.format(obj)
raise ValueError(msg) raise ValueError(msg)
raise ValueError('callable {0!r} is not supported by signature'.format(obj)) raise ValueError('callable {!r} is not supported by signature'.format(obj))
class _void(object): class _void(object):
@ -190,7 +190,7 @@ class _ParameterKind(int):
return self._name return self._name
def __repr__(self): def __repr__(self):
return '<_ParameterKind: {0!r}>'.format(self._name) return '<_ParameterKind: {!r}>'.format(self._name)
_POSITIONAL_ONLY = _ParameterKind(0, name='POSITIONAL_ONLY') _POSITIONAL_ONLY = _ParameterKind(0, name='POSITIONAL_ONLY')
@ -238,7 +238,7 @@ class Parameter(object):
if default is not _empty: if default is not _empty:
if kind in (_VAR_POSITIONAL, _VAR_KEYWORD): if kind in (_VAR_POSITIONAL, _VAR_KEYWORD):
msg = '{0} parameters cannot have default values'.format(kind) msg = '{} parameters cannot have default values'.format(kind)
raise ValueError(msg) raise ValueError(msg)
self._default = default self._default = default
self._annotation = annotation self._annotation = annotation
@ -251,7 +251,7 @@ class Parameter(object):
else: else:
name = str(name) name = str(name)
if kind != _POSITIONAL_ONLY and not re.match(r'[a-z_]\w*$', name, re.I): if kind != _POSITIONAL_ONLY and not re.match(r'[a-z_]\w*$', name, re.I):
msg = '{0!r} is not a valid parameter name'.format(name) msg = '{!r} is not a valid parameter name'.format(name)
raise ValueError(msg) raise ValueError(msg)
self._name = name self._name = name
@ -302,15 +302,15 @@ class Parameter(object):
if kind == _POSITIONAL_ONLY: if kind == _POSITIONAL_ONLY:
if formatted is None: if formatted is None:
formatted = '' formatted = ''
formatted = '<{0}>'.format(formatted) formatted = '<{}>'.format(formatted)
# Add annotation and default value # Add annotation and default value
if self._annotation is not _empty: if self._annotation is not _empty:
formatted = '{0}:{1}'.format(formatted, formatted = '{}:{}'.format(formatted,
formatannotation(self._annotation)) formatannotation(self._annotation))
if self._default is not _empty: if self._default is not _empty:
formatted = '{0}={1}'.format(formatted, repr(self._default)) formatted = '{}={}'.format(formatted, repr(self._default))
if kind == _VAR_POSITIONAL: if kind == _VAR_POSITIONAL:
formatted = '*' + formatted formatted = '*' + formatted
@ -320,11 +320,11 @@ class Parameter(object):
return formatted return formatted
def __repr__(self): def __repr__(self):
return '<{0} at {1:#x} {2!r}>'.format(self.__class__.__name__, return '<{} at {:#x} {!r}>'.format(self.__class__.__name__,
id(self), self.name) id(self), self.name)
def __hash__(self): def __hash__(self):
msg = "unhashable type: '{0}'".format(self.__class__.__name__) msg = "unhashable type: '{}'".format(self.__class__.__name__)
raise TypeError(msg) raise TypeError(msg)
def __eq__(self, other): def __eq__(self, other):
@ -421,7 +421,7 @@ class BoundArguments(object):
return kwargs return kwargs
def __hash__(self): def __hash__(self):
msg = "unhashable type: '{0}'".format(self.__class__.__name__) msg = "unhashable type: '{}'".format(self.__class__.__name__)
raise TypeError(msg) raise TypeError(msg)
def __eq__(self, other): def __eq__(self, other):
@ -489,7 +489,7 @@ class Signature(object):
param = param.replace(name=name) param = param.replace(name=name)
if name in params: if name in params:
msg = 'duplicate parameter name: {0!r}'.format(name) msg = 'duplicate parameter name: {!r}'.format(name)
raise ValueError(msg) raise ValueError(msg)
params[name] = param params[name] = param
else: else:
@ -504,7 +504,7 @@ class Signature(object):
'''Constructs Signature for the given python function''' '''Constructs Signature for the given python function'''
if not isinstance(func, types.FunctionType): if not isinstance(func, types.FunctionType):
raise TypeError('{0!r} is not a Python function'.format(func)) raise TypeError('{!r} is not a Python function'.format(func))
Parameter = cls._parameter_cls Parameter = cls._parameter_cls
@ -599,7 +599,7 @@ class Signature(object):
return_annotation=return_annotation) return_annotation=return_annotation)
def __hash__(self): def __hash__(self):
msg = "unhashable type: '{0}'".format(self.__class__.__name__) msg = "unhashable type: '{}'".format(self.__class__.__name__)
raise TypeError(msg) raise TypeError(msg)
def __eq__(self, other): def __eq__(self, other):
@ -608,8 +608,8 @@ class Signature(object):
len(self.parameters) != len(other.parameters)): len(self.parameters) != len(other.parameters)):
return False return False
other_positions = dict((param, idx) other_positions = {param: idx
for idx, param in enumerate(other.parameters.keys())) for idx, param in enumerate(other.parameters.keys())}
for idx, (param_name, param) in enumerate(self.parameters.items()): for idx, (param_name, param) in enumerate(self.parameters.items()):
if param.kind == _KEYWORD_ONLY: if param.kind == _KEYWORD_ONLY:
@ -799,10 +799,10 @@ class Signature(object):
result.append(formatted) result.append(formatted)
rendered = '({0})'.format(', '.join(result)) rendered = '({})'.format(', '.join(result))
if self.return_annotation is not _empty: if self.return_annotation is not _empty:
anno = formatannotation(self.return_annotation) anno = formatannotation(self.return_annotation)
rendered += ' -> {0}'.format(anno) rendered += ' -> {}'.format(anno)
return rendered return rendered

2
graphene/types/base.py
View File

@ -18,7 +18,7 @@ class BaseOptions(object):
if not self._frozen: if not self._frozen:
super(BaseOptions, self).__setattr__(name, value) super(BaseOptions, self).__setattr__(name, value)
else: else:
raise Exception("Can't modify frozen Options {0}".format(self)) raise Exception("Can't modify frozen Options {}".format(self))
def __repr__(self): def __repr__(self):
return "<{} name={}>".format(self.__class__.__name__, repr(self.name)) return "<{} name={}>".format(self.__class__.__name__, repr(self.name))