diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /tools/python/google | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/python/google')
-rw-r--r-- | tools/python/google/httpd_utils.py | 2 | ||||
-rw-r--r-- | tools/python/google/logging_utils.py | 10 | ||||
-rw-r--r-- | tools/python/google/path_utils.py | 4 | ||||
-rw-r--r-- | tools/python/google/platform_utils_win.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tools/python/google/httpd_utils.py b/tools/python/google/httpd_utils.py index 0281228..28952ed 100644 --- a/tools/python/google/httpd_utils.py +++ b/tools/python/google/httpd_utils.py @@ -32,7 +32,7 @@ def GetCygserverPath(start_dir, apache2=False): 'cygwin', 'usr', 'sbin') return cygserver_path - + def StartServer(document_root=None, output_dir=None, apache2=False): """Starts a local server on port 8000 using the basic configuration files. diff --git a/tools/python/google/logging_utils.py b/tools/python/google/logging_utils.py index 673097b..5fd95d3 100644 --- a/tools/python/google/logging_utils.py +++ b/tools/python/google/logging_utils.py @@ -26,11 +26,11 @@ class StdoutStderrHandler(logging.Handler): sys.stdout ''' logging.Handler.__init__(self) - self._err = logging.StreamHandler(err) + self._err = logging.StreamHandler(err) self._out = logging.StreamHandler(out) self._threshold = threshold self._last_was_err = False - + def setLevel(self, lvl): logging.Handler.setLevel(self, lvl) self._err.setLevel(lvl) @@ -62,17 +62,17 @@ class StdoutStderrHandler(logging.Handler): FORMAT = "%(asctime)s %(filename)s [%(levelname)s] %(message)s" DATEFMT = "%H:%M:%S" -def config_root(level=logging.INFO, threshold=logging.WARNING, format=FORMAT, +def config_root(level=logging.INFO, threshold=logging.WARNING, format=FORMAT, datefmt=DATEFMT): ''' Configure the root logger to use a StdoutStderrHandler and some default - formatting. + formatting. Args: level: messages below this level are ignored threshold: below this logging level messages are sent to stdout, otherwise they are sent to stderr format: format for log messages, see logger.Format datefmt: format for date in log messages - + ''' # to set the handler of the root logging object, we need to do setup # manually rather than using basicConfig diff --git a/tools/python/google/path_utils.py b/tools/python/google/path_utils.py index 751cfb5..6f94a84 100644 --- a/tools/python/google/path_utils.py +++ b/tools/python/google/path_utils.py @@ -12,7 +12,7 @@ import os import sys class PathNotFound(Exception): pass - + def ScriptDir(): """Get the full path to the directory containing the current script.""" script_filename = os.path.abspath(sys.argv[0]) @@ -20,7 +20,7 @@ def ScriptDir(): def FindAncestor(start_dir, ancestor): """Finds an ancestor dir in a path. - + For example, FindAncestor('c:\foo\bar\baz', 'bar') would return 'c:\foo\bar'. Unlike FindUpward*, this only looks at direct path ancestors. """ diff --git a/tools/python/google/platform_utils_win.py b/tools/python/google/platform_utils_win.py index 45419d7..eef2b50 100644 --- a/tools/python/google/platform_utils_win.py +++ b/tools/python/google/platform_utils_win.py @@ -157,7 +157,7 @@ class PlatformUtility(object): ' -C \'ServerRoot "%(server_root)s"\'' ) if apache2: - httpd_cmd_string = ('export CYGWIN=server;' + httpd_cmd_string + + httpd_cmd_string = ('export CYGWIN=server;' + httpd_cmd_string + ' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\'') if document_root: httpd_cmd_string += ' -C \'DocumentRoot "%(document_root)s"\'' |