Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Replace iteritems/itervalues/iterkeys with native versions #7692

Merged
merged 9 commits into from
Jun 15, 2020

Conversation

clokep
Copy link
Member

@clokep clokep commented Jun 12, 2020

No need to use six.iter* anymore now that we're Python 3 only.

I checked there were any others with grep -rE "iter(items|keys|values)" . (this did find some in synctl, but I'm unsure about changing those).

I essentially did replace with (six\.)?iter(items|keys|values)\(([a-zA-Z_0-9\.\[\]]+)\) -> $3.$2() and then had to do a few by hand.

This is broken into a bunch of commits that really just do the above on different directories. There's a separate commit at the end which runs the linting.

@clokep
Copy link
Member Author

clokep commented Jun 12, 2020

This unfortunately has a decent chance of bitrotting (or bitrotting other things). :( We can always break it into smaller commits if necessary...

@clokep clokep requested a review from a team June 12, 2020 21:10
@clokep clokep merged commit bd6dc17 into develop Jun 15, 2020
@clokep clokep deleted the clokep/six-iter branch June 15, 2020 11:03
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit '03619324f':
  Create a ListenerConfig object (#7681)
  Fix changelog wording
  1.15.1
  Wrap register_device coroutine in an ensureDeferred (#7684)
  Ensure the body is a string before comparing push rules. (#7701)
  Ensure etag is a string for GET room_keys/version response (#7691)
  Update m.id.phone to use 'phone' instead of 'number' (#7687)
  Fix "There was no active span when trying to log." error (#7698)
  Enable 3PID add/bind/unbind endpoints on r0 routes
  Discard RDATA from already seen positions. (#7648)
  Replace iteritems/itervalues/iterkeys with native versions. (#7692)
  Fix warnings about losing log context during UI auth. (#7688)
  Fix a typo when comparing the URI & method during UI Auth. (#7689)
  Remove "user_id" from GET /presence. (#7606)
  Increase the default SAML session expirary time to 15 minutes. (#7664)
  fix typo in sample_config.yaml (#7652)
  Take out a lock before modifying _CACHES (#7663)
  Add option to enable encryption by default for new rooms (#7639)
  Clean-up the fallback login code. (#7657)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants