NotificationsYou must be signed in to change notification settings
Fork675
Star2.4k

Commit489b0d3

authored

Merge pull request#1481 from JohnVillalovos/jlvillal/no_getmro

chore: use built-in function issubclass() instead of getmro()

2 parents56770ce +81f6386 commit489b0d3Copy full SHA for 489b0d3

File tree

1 file changed

+10

-12

lines changed

gitlab/v4
- cli.py

1 file changed

+10

-12

lines changed

`‎gitlab/v4/cli.py‎`

Lines changed: 10 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`# You should have received a copy of the GNU Lesser General Public License`
`17`	`17`	`# along with this program. If not, see <http://www.gnu.org/licenses/>.`
`18`	`18`
`19`		`-importinspect`
`20`	`19`	`importoperator`
`21`	`20`	`importsys`
`22`	`21`
`@@ -72,7 +71,7 @@ def do_custom(self):`
`72`	`71`	`ifself.mgr._from_parent_attrs:`
`73`	`72`	`forkinself.mgr._from_parent_attrs:`
`74`	`73`	`data[k]=self.args[k]`
`75`		`-ifgitlab.mixins.GetWithoutIdMixinnotininspect.getmro(self.cls):`
	`74`	`+ifnotissubclass(self.cls,gitlab.mixins.GetWithoutIdMixin):`
`76`	`75`	`data[self.cls._id_attr]=self.args.pop(self.cls._id_attr)`
`77`	`76`	`o=self.cls(self.mgr,data)`
`78`	`77`	`method_name=self.action.replace("-","_")`
`@@ -103,7 +102,7 @@ def do_list(self):`
`103`	`102`
`104`	`103`	`defdo_get(self):`
`105`	`104`	`id=None`
`106`		`-ifgitlab.mixins.GetWithoutIdMixinnotininspect.getmro(self.mgr_cls):`
	`105`	`+ifnotissubclass(self.mgr_cls,gitlab.mixins.GetWithoutIdMixin):`
`107`	`106`	`id=self.args.pop(self.cls._id_attr)`
`108`	`107`
`109`	`108`	`try:`
`@@ -120,7 +119,7 @@ def do_delete(self):`
`120`	`119`
`121`	`120`	`defdo_update(self):`
`122`	`121`	`id=None`
`123`		`-ifgitlab.mixins.GetWithoutIdMixinnotininspect.getmro(self.mgr_cls):`
	`122`	`+ifnotissubclass(self.mgr_cls,gitlab.mixins.GetWithoutIdMixin):`
`124`	`123`	`id=self.args.pop(self.cls._id_attr)`
`125`	`124`	`try:`
`126`	`125`	`returnself.mgr.update(id,self.args)`
`@@ -160,7 +159,7 @@ def _populate_sub_parser_by_class(cls, sub_parser):`
`160`	`159`	`sub_parser_action.add_argument("--%s"%id_attr,required=True)`
`161`	`160`
`162`	`161`	`ifaction_name=="get":`
`163`		`-ifgitlab.mixins.GetWithoutIdMixinnotininspect.getmro(cls):`
	`162`	`+ifnotissubclass(cls,gitlab.mixins.GetWithoutIdMixin):`
`164`	`163`	`ifcls._id_attrisnotNone:`
`165`	`164`	`id_attr=cls._id_attr.replace("_","-")`
`166`	`165`	`sub_parser_action.add_argument("--%s"%id_attr,required=True)`
`@@ -210,7 +209,7 @@ def _populate_sub_parser_by_class(cls, sub_parser):`
`210`	`209`	`sub_parser_action.add_argument("--sudo",required=False)`
`211`	`210`
`212`	`211`	`# We need to get the object somehow`
`213`		`-ifgitlab.mixins.GetWithoutIdMixinnotininspect.getmro(cls):`
	`212`	`+ifnotissubclass(cls,gitlab.mixins.GetWithoutIdMixin):`
`214`	`213`	`ifcls._id_attrisnotNone:`
`215`	`214`	`id_attr=cls._id_attr.replace("_","-")`
`216`	`215`	`sub_parser_action.add_argument("--%s"%id_attr,required=True)`
`@@ -268,12 +267,11 @@ def extend_parser(parser):`
`268`	`267`	`# populate argparse for all Gitlab Object`
`269`	`268`	`classes= []`
`270`	`269`	`forclsingitlab.v4.objects.__dict__.values():`
`271`		`-try:`
`272`		`-ifgitlab.base.RESTManagerininspect.getmro(cls):`
`273`		`-ifcls._obj_clsisnotNone:`
`274`		`-classes.append(cls._obj_cls)`
`275`		`-exceptAttributeError:`
`276`		`-pass`
	`270`	`+ifnotisinstance(cls,type):`
	`271`	`+continue`
	`272`	`+ifissubclass(cls,gitlab.base.RESTManager):`
	`273`	`+ifcls._obj_clsisnotNone:`
	`274`	`+classes.append(cls._obj_cls)`
`277`	`275`	`classes.sort(key=operator.attrgetter("__name__"))`
`278`	`276`
`279`	`277`	`forclsinclasses:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit489b0d3

File tree

1 file changed

1 file changed

`‎gitlab/v4/cli.py‎`

0 commit comments