From: Éric Araujo <merwok@netwok.org>
Date: Thu, 28 Jul 2011 21:00:14 +0000 (+0200)
Subject: Merge profile docs followup (#12417) from 3.1
X-Git-Tag: v3.2.2rc1~56^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc662ddda2bfd43b10c0a4f8a814e36445f22515;p=thirdparty%2FPython%2Fcpython.git

Merge profile docs followup (#12417) from 3.1
---

fc662ddda2bfd43b10c0a4f8a814e36445f22515
diff --cc Lib/pstats.py
index 8a025cdc544a,74360e38dbcc..3f0add2c65e6
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@@ -6,11 -4,9 +4,9 @@@
  # Based on prior profile module by Sjoerd Mullender...
  #   which was hacked somewhat by: Guido van Rossum
  
- """Class for profiling Python code."""
- 
  # Copyright Disney Enterprises, Inc.  All Rights Reserved.
  # Licensed to PSF under a Contributor Agreement
 -# 
 +#
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at