From 44fa5352360b78696c3d81cafa8e24eaa4f6c3ed Mon Sep 17 00:00:00 2001 From: ianb Date: Fri, 20 Oct 2006 22:08:05 +0000 Subject: A big commit, primarily aesthetic/whitespace in nature. This is the result of running pylint over the codebase. Some minor/hard-to-reach typos were also picked up. --- paste/util/datetimeutil.py | 65 +++++++++++++++++++++++++------------------- paste/util/scgiserver.py | 8 +++--- paste/util/threadedprint.py | 2 +- paste/util/threadinglocal.py | 4 +++ 4 files changed, 46 insertions(+), 33 deletions(-) (limited to 'paste/util') diff --git a/paste/util/datetimeutil.py b/paste/util/datetimeutil.py index 6df3993..b1a7f38 100644 --- a/paste/util/datetimeutil.py +++ b/paste/util/datetimeutil.py @@ -53,7 +53,7 @@ correctly. ``timedelta`` values will have a normalized representation. """ -from datetime import timedelta, time, date, datetime +from datetime import timedelta, time, date from time import localtime import string @@ -84,14 +84,16 @@ def parse_timedelta(val): fMin = ("m" in val or ":" in val) fFraction = "." in val for noise in "minu:teshour()": - val = string.replace(val,noise,' ') + val = string.replace(val, noise, ' ') val = string.strip(val) val = string.split(val) hr = 0.0 mi = 0 val.reverse() - if fHour: hr = int(val.pop()) - if fMin: mi = int(val.pop()) + if fHour: + hr = int(val.pop()) + if fMin: + mi = int(val.pop()) if len(val) > 0 and not hr: hr = int(val.pop()) return timedelta(hours=hr, minutes=mi) @@ -110,7 +112,7 @@ def normalize_timedelta(val): return '' hr = val.seconds/3600 mn = (val.seconds % 3600)/60 - return "%d.%02d" % (hr,mn*100/60) + return "%d.%02d" % (hr, mn * 100/60) # # time @@ -120,10 +122,10 @@ def parse_time(val): return None hr = mi = 0 val = string.lower(val) - amflag = (-1 != string.find(val,'a')) # set if AM is found - pmflag = (-1 != string.find(val,'p')) # set if PM is found + amflag = (-1 != string.find(val, 'a')) # set if AM is found + pmflag = (-1 != string.find(val, 'p')) # set if PM is found for noise in ":amp.": - val = string.replace(val,noise,' ') + val = string.replace(val, noise, ' ') val = string.split(val) if len(val) > 1: hr = int(val[0]) @@ -147,9 +149,11 @@ def parse_time(val): mi = int(val[-2:]) else: hr = int(val[:1]) - if amflag and hr >= 12: hr = hr - 12 - if pmflag and hr < 12 : hr = hr + 12 - return time(hr,mi) + if amflag and hr >= 12: + hr = hr - 12 + if pmflag and hr < 12: + hr = hr + 12 + return time(hr, mi) def normalize_time(value, ampm): if not value: @@ -166,7 +170,7 @@ def normalize_time(value, ampm): am = "PM" if hr > 12: hr = hr - 12 - return "%02d:%02d %s" % (hr,value.minute,am) + return "%02d:%02d %s" % (hr, value.minute, am) # # Date Processing @@ -178,16 +182,18 @@ _str2num = {'jan':1, 'feb':2, 'mar':3, 'apr':4, 'may':5, 'jun':6, 'jul':7, 'aug':8, 'sep':9, 'oct':10, 'nov':11, 'dec':12 } def _month(val): - for (key,mon) in _str2num.items(): + for (key, mon) in _str2num.items(): if key in val: return mon raise TypeError("unknown month '%s'" % val) -_days_in_month = {1:31,2:28,3:31,4:30,5:31,6:30, - 7:31,8:31,9:30,10:31,11:30,12:31 } -_num2str = { 1:'Jan', 2:'Feb', 3:'Mar', 4:'Apr', 5:'May', 6:'Jun', - 7:'Jul', 8:'Aug', 9:'Sep', 10:'Oct', 11:'Nov', 12:'Dec' } -_wkdy = ("mon","tue","wed","thu","fri","sat","sun" ) +_days_in_month = {1: 31, 2: 28, 3: 31, 4: 30, 5: 31, 6: 30, + 7: 31, 8: 31, 9: 30, 10: 31, 11: 30, 12: 31, + } +_num2str = {1: 'Jan', 2: 'Feb', 3: 'Mar', 4: 'Apr', 5: 'May', 6: 'Jun', + 7: 'Jul', 8: 'Aug', 9: 'Sep', 10: 'Oct', 11: 'Nov', 12: 'Dec', + } +_wkdy = ("mon", "tue", "wed", "thu", "fri", "sat", "sun") def parse_date(val): if not(val): @@ -198,13 +204,13 @@ def parse_date(val): # optimized check for YYYY-MM-DD strict = val.split("-") if len(strict) == 3: - (y,m,d) = strict + (y, m, d) = strict if "+" in d: d = d.split("+")[0] if " " in d: d = d.split(" ")[0] try: - now = date(int(y),int(m),int(d)) + now = date(int(y), int(m), int(d)) val = "xxx" + val[10:] except ValueError: pass @@ -236,10 +242,10 @@ def parse_date(val): # ok, standard parsing yr = mo = dy = None - for noise in ('/','-',',','*'): - val = string.replace(val,noise,' ') + for noise in ('/', '-', ',', '*'): + val = string.replace(val, noise, ' ') for noise in _wkdy: - val = string.replace(val,noise,' ') + val = string.replace(val, noise, ' ') out = [] last = False ldig = False @@ -337,10 +343,13 @@ def parse_date(val): else: raise TypeError("four digit year required") tm = localtime() - if mo is None: mo = tm[1] - if dy is None: dy = tm[2] - if yr is None: yr = tm[0] - return date(yr,mo,dy) + if mo is None: + mo = tm[1] + if dy is None: + dy = tm[2] + if yr is None: + yr = tm[0] + return date(yr, mo, dy) def normalize_date(val, iso8601=True): if not val: @@ -349,4 +358,4 @@ def normalize_date(val, iso8601=True): val = parse_date(val) if iso8601: return "%4d-%02d-%02d" % (val.year, val.month, val.day) - return "%02d %s %4d" % (val.day,_num2str[val.month],val.year) + return "%02d %s %4d" % (val.day, _num2str[val.month], val.year) diff --git a/paste/util/scgiserver.py b/paste/util/scgiserver.py index 332f6f1..b52ed9d 100644 --- a/paste/util/scgiserver.py +++ b/paste/util/scgiserver.py @@ -59,10 +59,10 @@ class SWAP(scgi_server.SCGIHandler): environ = self.read_env(input) environ['wsgi.input'] = input environ['wsgi.errors'] = sys.stderr - environ['wsgi.version'] = (1,0) + environ['wsgi.version'] = (1, 0) environ['wsgi.multithread'] = False environ['wsgi.multiprocess'] = True - environ['wsgi.run_once'] = False + environ['wsgi.run_once'] = False # dunno how SCGI does HTTPS signalling; can't test it myself... @CTB if environ.get('HTTPS','off') in ('on','1'): @@ -86,7 +86,7 @@ class SWAP(scgi_server.SCGIHandler): def write(data): chunks.append(data) - def start_response(status,response_headers,exc_info=None): + def start_response(status, response_headers, exc_info=None): if exc_info: try: if headers_sent: @@ -97,7 +97,7 @@ class SWAP(scgi_server.SCGIHandler): elif headers_set: raise AssertionError("Headers already set!") - headers_set[:] = [status,response_headers] + headers_set[:] = [status, response_headers] return write ### diff --git a/paste/util/threadedprint.py b/paste/util/threadedprint.py index ed678fb..0cdcdd6 100644 --- a/paste/util/threadedprint.py +++ b/paste/util/threadedprint.py @@ -62,7 +62,7 @@ TODO import threading import sys -import filemixin +from paste.util import filemixin class PrintCatcher(filemixin.FileMixin): diff --git a/paste/util/threadinglocal.py b/paste/util/threadinglocal.py index 57afa17..06f2643 100644 --- a/paste/util/threadinglocal.py +++ b/paste/util/threadinglocal.py @@ -1,5 +1,9 @@ # (c) 2005 Ian Bicking and contributors; written for Paste (http://pythonpaste.org) # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php +""" +Implementation of thread-local storage, for Python versions that don't +have thread local storage natively. +""" try: import threading -- cgit v1.2.1