diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2017-07-08 21:31:47 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-07-08 21:31:47 -0400 |
commit | f4f27fae603a8beedf2a8f75cd9dcdda61ebf5a0 (patch) | |
tree | 54b93412edc990ea9a832f082e6041783fb8c3a7 /cherrypy/test/helper.py | |
parent | 459099b5f3b4c0422c66296da129c3c8b3e70b5e (diff) | |
download | cherrypy-git-f4f27fae603a8beedf2a8f75cd9dcdda61ebf5a0.tar.gz |
Replace iteritems with six usage.
Diffstat (limited to 'cherrypy/test/helper.py')
-rw-r--r-- | cherrypy/test/helper.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cherrypy/test/helper.py b/cherrypy/test/helper.py index e9ec0d0f..5b012fad 100644 --- a/cherrypy/test/helper.py +++ b/cherrypy/test/helper.py @@ -16,7 +16,7 @@ import pytest import six import cherrypy -from cherrypy._cpcompat import text_or_bytes, copyitems, HTTPSConnection, ntob +from cherrypy._cpcompat import text_or_bytes, HTTPSConnection, ntob from cherrypy.lib import httputil from cherrypy.lib import gctools from cherrypy.test import webtest @@ -91,7 +91,8 @@ class LocalSupervisor(Supervisor): cherrypy.engine.exit() - for name, server in copyitems(getattr(cherrypy, 'servers', {})): + servers_copy = list(six.iteritems(getattr(cherrypy, 'servers', {}))) + for name, server in servers_copy: server.unsubscribe() del cherrypy.servers[name] |