McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

I actually missed a conflict. Wow.

Browse source
This commit is contained in:
Pradyun S. Gedam 2017-08-03 03:31:44 +05:30
parent c365304f66
commit cb113d5339
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pip/_vendor/pkg_resources/__init__.py
View file

@ -2950,27 +2950,6 @@ class Requirement(packaging.requirements.Requirement):
return req
<<<<<<< HEAD
def _get_mro(cls):
"""Get an mro for a type or classic class"""
if not isinstance(cls, type):
class new_cls(cls, object):
pass
return new_cls.__mro__[1:]
return cls.__mro__
||||||| merged common ancestors
def _get_mro(cls):
"""Get an mro for a type or classic class"""
if not isinstance(cls, type):
class cls(cls, object):
pass
return cls.__mro__[1:]
return cls.__mro__
=======
def _always_object(classes):
"""
Ensure object appears in the mro even
@ -2979,7 +2958,6 @@ def _always_object(classes):
if object not in classes:
return classes + (object,)
return classes
>>>>>>> master
def _find_adapter(registry, ob):