diff options
| author | Lakin Wecker <none@none> | 2009-06-01 19:07:39 +0000 |
|---|---|---|
| committer | Lakin Wecker <none@none> | 2009-06-01 19:07:39 +0000 |
| commit | 6a2c82c52b79596ddd6c9b4df646d133d51ff4c6 (patch) | |
| tree | daee3f0163a3c526007c07eb08fa046c0516b116 /cherrypy/lib/profiler.py | |
| parent | 7281d1e7a6e8cd8a3f3e9f9c4d9174b510e3eb5e (diff) | |
| download | cherrypy-git-6a2c82c52b79596ddd6c9b4df646d133d51ff4c6.tar.gz | |
trunk - more changes to bring the two branches into a more similar state - this time normalizing StringIO imports.
Diffstat (limited to 'cherrypy/lib/profiler.py')
| -rw-r--r-- | cherrypy/lib/profiler.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cherrypy/lib/profiler.py b/cherrypy/lib/profiler.py index fe4dcd7b..41382b92 100644 --- a/cherrypy/lib/profiler.py +++ b/cherrypy/lib/profiler.py @@ -54,11 +54,7 @@ except ImportError: import os, os.path import sys -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - +from cherrypy.py3util import StringIO _count = 0 |