Skip to content

Commit

Permalink
Remove Config fix
Browse files Browse the repository at this point in the history
It's been moved to Cog-Creators#2795

Signed-off-by: Toby Harradine <[email protected]>
  • Loading branch information
Tobotimus committed Jun 23, 2019
1 parent 48ded4a commit c2ddf59
Showing 1 changed file with 5 additions and 19 deletions.
24 changes: 5 additions & 19 deletions redbot/core/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -852,22 +852,9 @@ def _get_base_group(self, category: str, *primary_keys: str) -> Group:
custom_group_data=self.custom_groups,
is_custom=is_custom,
)

if category == self.GLOBAL:
primary_key_len = 0
elif category == self.MEMBER:
primary_key_len = 2
elif is_custom:
primary_key_len = self.custom_groups[category]
else:
primary_key_len = 1
if len(primary_keys) < primary_key_len:
defaults = {}
else:
defaults = self.defaults.get(category, {})
return Group(
identifier_data=identifier_data,
defaults=defaults,
defaults=self.defaults.get(category, {}),
driver=self.driver,
force_registration=self.force_registration,
)
Expand Down Expand Up @@ -988,15 +975,14 @@ async def _all_from_scope(self, scope: str) -> Dict[int, Dict[Any, Any]]:
"""
group = self._get_base_group(scope)
ret = {}
defaults = self.defaults.get(scope, {})

try:
dict_ = await self.driver.get(group.identifier_data)
except KeyError:
pass
else:
for k, v in dict_.items():
data = deepcopy(defaults)
data = group.defaults
data.update(v)
ret[int(k)] = data

Expand Down Expand Up @@ -1070,11 +1056,11 @@ async def all_users(self) -> dict:
"""
return await self._all_from_scope(self.USER)

def _all_members_from_guild(self, group: Group, guild_data: dict) -> dict:
@staticmethod
def _all_members_from_guild(group: Group, guild_data: dict) -> dict:
ret = {}
defaults = self.defaults.get(self.MEMBER, {})
for member_id, member_data in guild_data.items():
new_member_data = deepcopy(defaults)
new_member_data = group.defaults
new_member_data.update(member_data)
ret[int(member_id)] = new_member_data
return ret
Expand Down

0 comments on commit c2ddf59

Please sign in to comment.