mirror of
https://github.com/jupyterhub/jupyterhub.git
synced 2025-10-07 18:14:10 +00:00
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
@@ -84,7 +84,7 @@ class UserDict(dict):
|
|||||||
if user.name == key:
|
if user.name == key:
|
||||||
key = user.id
|
key = user.id
|
||||||
break
|
break
|
||||||
return dict.__contains__(self, key)
|
return super().__contains__(key)
|
||||||
|
|
||||||
def __getitem__(self, key):
|
def __getitem__(self, key):
|
||||||
"""UserDict allows retrieval of user by any of:
|
"""UserDict allows retrieval of user by any of:
|
||||||
@@ -108,7 +108,7 @@ class UserDict(dict):
|
|||||||
if orm_user.id not in self:
|
if orm_user.id not in self:
|
||||||
user = self[orm_user.id] = User(orm_user, self.settings)
|
user = self[orm_user.id] = User(orm_user, self.settings)
|
||||||
return user
|
return user
|
||||||
user = dict.__getitem__(self, orm_user.id)
|
user = super().__getitem__(orm_user.id)
|
||||||
user.db = self.db
|
user.db = self.db
|
||||||
return user
|
return user
|
||||||
elif isinstance(key, int):
|
elif isinstance(key, int):
|
||||||
@@ -119,7 +119,7 @@ class UserDict(dict):
|
|||||||
raise KeyError("No such user: %s" % id)
|
raise KeyError("No such user: %s" % id)
|
||||||
user = self.add(orm_user)
|
user = self.add(orm_user)
|
||||||
else:
|
else:
|
||||||
user = dict.__getitem__(self, id)
|
user = super().__getitem__(id)
|
||||||
return user
|
return user
|
||||||
else:
|
else:
|
||||||
raise KeyError(repr(key))
|
raise KeyError(repr(key))
|
||||||
@@ -145,7 +145,7 @@ class UserDict(dict):
|
|||||||
self.db.expunge(orm_spawner)
|
self.db.expunge(orm_spawner)
|
||||||
if user.orm_user in self.db:
|
if user.orm_user in self.db:
|
||||||
self.db.expunge(user.orm_user)
|
self.db.expunge(user.orm_user)
|
||||||
dict.__delitem__(self, user.id)
|
super().__delitem__(user.id)
|
||||||
|
|
||||||
def delete(self, key):
|
def delete(self, key):
|
||||||
"""Delete a user from the cache and the database"""
|
"""Delete a user from the cache and the database"""
|
||||||
|
2
setup.py
2
setup.py
@@ -301,7 +301,7 @@ class develop_js_css(develop):
|
|||||||
if not self.uninstall:
|
if not self.uninstall:
|
||||||
self.distribution.run_command('js')
|
self.distribution.run_command('js')
|
||||||
self.distribution.run_command('css')
|
self.distribution.run_command('css')
|
||||||
develop.run(self)
|
super().run()
|
||||||
|
|
||||||
|
|
||||||
setup_args['cmdclass']['develop'] = develop_js_css
|
setup_args['cmdclass']['develop'] = develop_js_css
|
||||||
|
Reference in New Issue
Block a user