summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paste/auth/auth_tkt.py1
-rw-r--r--paste/auth/cookie.py2
-rw-r--r--paste/auth/digest.py2
-rw-r--r--paste/auth/open_id.py2
-rw-r--r--paste/debug/fsdiff.py2
-rw-r--r--paste/modpython.py1
-rw-r--r--paste/session.py4
-rw-r--r--paste/util/scgiserver.py1
8 files changed, 5 insertions, 10 deletions
diff --git a/paste/auth/auth_tkt.py b/paste/auth/auth_tkt.py
index 999e8c7..e3e64dc 100644
--- a/paste/auth/auth_tkt.py
+++ b/paste/auth/auth_tkt.py
@@ -39,7 +39,6 @@ non-Python code run under Apache.
import time as time_mod
import md5
-import cgi
import Cookie
from paste import request
diff --git a/paste/auth/cookie.py b/paste/auth/cookie.py
index ebb9aba..df63329 100644
--- a/paste/auth/cookie.py
+++ b/paste/auth/cookie.py
@@ -373,7 +373,7 @@ def make_auth_cookie(
try:
maxlen = int(maxlen)
except ValueError:
- raise ValieError('Bad value for maxlen (must be int): %r'
+ raise ValueError('Bad value for maxlen (must be int): %r'
% maxlen)
return AuthCookieHandler(
app, cookie_name=cookie_name, scanlist=scanlist,
diff --git a/paste/auth/digest.py b/paste/auth/digest.py
index eae81a2..0fe380b 100644
--- a/paste/auth/digest.py
+++ b/paste/auth/digest.py
@@ -31,7 +31,7 @@ to use sha would be a good thing.
"""
from paste.httpexceptions import HTTPUnauthorized
from paste.httpheaders import *
-import md5, time, random, urllib2
+import md5, time, random
def digest_password(realm, username, password):
""" construct the appropriate hashcode needed for HTTP digest """
diff --git a/paste/auth/open_id.py b/paste/auth/open_id.py
index d4996d4..eb01150 100644
--- a/paste/auth/open_id.py
+++ b/paste/auth/open_id.py
@@ -57,8 +57,6 @@ __all__ = ['AuthOpenIDHandler']
import cgi
import urlparse
-import cgitb
-import sys
import re
import paste.request
diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py
index 96f2744..2849ea8 100644
--- a/paste/debug/fsdiff.py
+++ b/paste/debug/fsdiff.py
@@ -117,7 +117,7 @@ class Snapshot(IterableUserDict):
if self.ignore_hidden and os.path.basename(fn).startswith('.'):
return True
for pat in self.ignore_wildcards:
- if fnmatch(fn, path):
+ if fnmatch(fn, pat):
return True
return False
diff --git a/paste/modpython.py b/paste/modpython.py
index 1a8bc5c..d2b7a7f 100644
--- a/paste/modpython.py
+++ b/paste/modpython.py
@@ -50,7 +50,6 @@ http://projects.amor.org/misc/svn/modpython_gateway.py
"""
import traceback
-import os
try:
from mod_python import apache
diff --git a/paste/session.py b/paste/session.py
index ca98441..387cf3f 100644
--- a/paste/session.py
+++ b/paste/session.py
@@ -226,11 +226,11 @@ class FileSession(object):
#Open every session and check that it isn't too old
for root, dirs, files in os.walk(self.session_file_path):
for f in files:
- self._clean_up_file(f)
+ self._clean_up_file(f, exp_time=exp_time, now=now)
finally:
cleaning_up = False
- def _clean_up_file(self, f):
+ def _clean_up_file(self, f, exp_time, now):
t = f.split("-")
if len(t) != 2:
return
diff --git a/paste/util/scgiserver.py b/paste/util/scgiserver.py
index 2237795..332f6f1 100644
--- a/paste/util/scgiserver.py
+++ b/paste/util/scgiserver.py
@@ -28,7 +28,6 @@ writing a nice extensible SCGI server for Python!
import sys
import time
-import os
from scgi import scgi_server
def debug(msg):