From 56b2917d3324d6bed780b233e4b3c092ff967f8d Mon Sep 17 00:00:00 2001 From: Allan Saddi Date: Sat, 2 Dec 2006 23:26:01 +0000 Subject: Change intra-package imports into absolute imports. --- ChangeLog | 4 ++++ MANIFEST.in | 1 - flup/resolver/complex.py | 2 +- flup/resolver/function.py | 2 +- flup/resolver/importingmodule.py | 2 +- flup/resolver/module.py | 2 +- flup/resolver/nopathinfo.py | 2 +- flup/resolver/objectpath.py | 2 +- flup/server/ajp.py | 4 ++-- flup/server/ajp_fork.py | 4 ++-- flup/server/fcgi.py | 4 ++-- flup/server/fcgi_fork.py | 6 +++--- flup/server/preforkserver.py | 18 +++++++++--------- flup/server/scgi.py | 4 ++-- flup/server/scgi_fork.py | 4 ++-- flup/server/threadedserver.py | 4 ++-- 16 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 MANIFEST.in diff --git a/ChangeLog b/ChangeLog index 90911f6..f749777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-12-02 Allan Saddi + + * Change intra-package imports into absolute imports. + 2006-12-02 Allan Saddi * Add forceCookieOutput attribute to SessionService to diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index b0d9ffe..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -include ChangeLog diff --git a/flup/resolver/complex.py b/flup/resolver/complex.py index c3016ea..f5b3aa0 100644 --- a/flup/resolver/complex.py +++ b/flup/resolver/complex.py @@ -29,7 +29,7 @@ __version__ = '$Revision$' import re -from resolver import * +from flup.resolver.resolver import * __all__ = ['ComplexResolver'] diff --git a/flup/resolver/function.py b/flup/resolver/function.py index 537caa3..15458be 100644 --- a/flup/resolver/function.py +++ b/flup/resolver/function.py @@ -27,7 +27,7 @@ __author__ = 'Allan Saddi ' __version__ = '$Revision$' -from resolver import * +from flup.resolver.resolver import * __all__ = ['FunctionResolver'] diff --git a/flup/resolver/importingmodule.py b/flup/resolver/importingmodule.py index 643fb4d..37fd83b 100644 --- a/flup/resolver/importingmodule.py +++ b/flup/resolver/importingmodule.py @@ -31,7 +31,7 @@ import sys import os import imp -from resolver import * +from flup.resolver.resolver import * __all__ = ['ImportingModuleResolver'] diff --git a/flup/resolver/module.py b/flup/resolver/module.py index 1d635fb..79171d6 100644 --- a/flup/resolver/module.py +++ b/flup/resolver/module.py @@ -27,7 +27,7 @@ __author__ = 'Allan Saddi ' __version__ = '$Revision$' -from resolver import * +from flup.resolver.resolver import * __all__ = ['ModuleResolver'] diff --git a/flup/resolver/nopathinfo.py b/flup/resolver/nopathinfo.py index e0f3182..db9bac0 100644 --- a/flup/resolver/nopathinfo.py +++ b/flup/resolver/nopathinfo.py @@ -27,7 +27,7 @@ __author__ = 'Allan Saddi ' __version__ = '$Revision$' -from resolver import * +from flup.resolver.resolver import * __all__ = ['NoPathInfoResolver'] diff --git a/flup/resolver/objectpath.py b/flup/resolver/objectpath.py index 9b74c3f..94e5558 100644 --- a/flup/resolver/objectpath.py +++ b/flup/resolver/objectpath.py @@ -29,7 +29,7 @@ __version__ = '$Revision$' import re -from resolver import * +from flup.resolver.resolver import * __all__ = ['ObjectPathResolver', 'expose'] diff --git a/flup/server/ajp.py b/flup/server/ajp.py index d4abc78..bb40cb1 100644 --- a/flup/server/ajp.py +++ b/flup/server/ajp.py @@ -82,8 +82,8 @@ __version__ = '$Revision$' import socket import logging -from ajp_base import BaseAJPServer, Connection -from threadedserver import ThreadedServer +from flup.server.ajp_base import BaseAJPServer, Connection +from flup.server.threadedserver import ThreadedServer __all__ = ['WSGIServer'] diff --git a/flup/server/ajp_fork.py b/flup/server/ajp_fork.py index e9172ef..8258634 100644 --- a/flup/server/ajp_fork.py +++ b/flup/server/ajp_fork.py @@ -82,8 +82,8 @@ __version__ = '$Revision$' import socket import logging -from ajp_base import BaseAJPServer, Connection -from preforkserver import PreforkServer +from flup.server.ajp_base import BaseAJPServer, Connection +from flup.server.preforkserver import PreforkServer __all__ = ['WSGIServer'] diff --git a/flup/server/fcgi.py b/flup/server/fcgi.py index 9d23051..47a7b63 100644 --- a/flup/server/fcgi.py +++ b/flup/server/fcgi.py @@ -51,8 +51,8 @@ __version__ = '$Revision$' import os -from fcgi_base import BaseFCGIServer, FCGI_RESPONDER -from threadedserver import ThreadedServer +from flup.server.fcgi_base import BaseFCGIServer, FCGI_RESPONDER +from flup.server.threadedserver import ThreadedServer __all__ = ['WSGIServer'] diff --git a/flup/server/fcgi_fork.py b/flup/server/fcgi_fork.py index d8de255..10d04e5 100644 --- a/flup/server/fcgi_fork.py +++ b/flup/server/fcgi_fork.py @@ -51,9 +51,9 @@ __version__ = '$Revision$' import os -from fcgi_base import BaseFCGIServer -from fcgi_base import FCGI_MAX_CONNS, FCGI_MAX_REQS, FCGI_MPXS_CONNS -from preforkserver import PreforkServer +from flup.server.fcgi_base import BaseFCGIServer, \ + FCGI_MAX_CONNS, FCGI_MAX_REQS, FCGI_MPXS_CONNS +from flup.server.preforkserver import PreforkServer __all__ = ['WSGIServer'] diff --git a/flup/server/preforkserver.py b/flup/server/preforkserver.py index d7c4bf4..0b00392 100644 --- a/flup/server/preforkserver.py +++ b/flup/server/preforkserver.py @@ -34,6 +34,15 @@ import select import errno import signal +try: + import fcntl +except ImportError: + def setCloseOnExec(sock): + pass +else: + def setCloseOnExec(sock): + fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC) + # If running Python < 2.4, require eunuchs module for socket.socketpair(). # See . if not hasattr(socket, 'socketpair'): @@ -53,15 +62,6 @@ if not hasattr(socket, 'socketpair'): socket.socketpair = socketpair -try: - import fcntl -except ImportError: - def setCloseOnExec(sock): - pass -else: - def setCloseOnExec(sock): - fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC) - class PreforkServer(object): """ A preforked server model conceptually similar to Apache httpd(2). At diff --git a/flup/server/scgi.py b/flup/server/scgi.py index d966798..e55800f 100644 --- a/flup/server/scgi.py +++ b/flup/server/scgi.py @@ -66,8 +66,8 @@ __version__ = '$Revision$' import logging import socket -from scgi_base import BaseSCGIServer, Connection -from threadedserver import ThreadedServer +from flup.server.scgi_base import BaseSCGIServer, Connection +from flup.server.threadedserver import ThreadedServer __all__ = ['WSGIServer'] diff --git a/flup/server/scgi_fork.py b/flup/server/scgi_fork.py index cc63338..4adaffd 100644 --- a/flup/server/scgi_fork.py +++ b/flup/server/scgi_fork.py @@ -66,8 +66,8 @@ __version__ = '$Revision$' import logging import socket -from scgi_base import BaseSCGIServer, Connection -from preforkserver import PreforkServer +from flup.server.scgi_base import BaseSCGIServer, Connection +from flup.server.preforkserver import PreforkServer __all__ = ['WSGIServer'] diff --git a/flup/server/threadedserver.py b/flup/server/threadedserver.py index bf08f52..c232347 100644 --- a/flup/server/threadedserver.py +++ b/flup/server/threadedserver.py @@ -33,8 +33,6 @@ import select import signal import errno -from threadpool import ThreadPool - try: import fcntl except ImportError: @@ -44,6 +42,8 @@ else: def setCloseOnExec(sock): fcntl.fcntl(sock.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC) +from flup.server.threadpool import ThreadPool + __all__ = ['ThreadedServer'] class ThreadedServer(object): -- cgit v1.2.1