summaryrefslogtreecommitdiff
path: root/mercurial/hgweb/server.py
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2011-10-01 20:49:36 +0000
committerLorry <lorry@roadtrain.codethink.co.uk>2012-09-27 13:27:51 +0000
commit921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch)
tree3c4a89176ea67fe4c7bf7b375488361a823c95fa /mercurial/hgweb/server.py
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-master.tar.gz
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'mercurial/hgweb/server.py')
-rw-r--r--mercurial/hgweb/server.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py
index 3ad99f4..9d363f0 100644
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
@@ -246,10 +246,9 @@ class _httprequesthandlerssl(_httprequesthandler):
try:
from threading import activeCount
- activeCount() # silence pyflakes
_mixin = SocketServer.ThreadingMixIn
except ImportError:
- if util.safehasattr(os, "fork"):
+ if hasattr(os, "fork"):
_mixin = SocketServer.ForkingMixIn
else:
class _mixin(object):