--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -13,9 +13,8 @@ platform-specific details from the core.
"""
from i18n import gettext as _
-from demandload import *
-demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile")
-demandload(globals(), "os threading time calendar ConfigParser locale")
+import cStringIO, errno, getpass, popen2, re, shutil, sys, tempfile
+import os, threading, time, calendar, ConfigParser, locale
_encoding = os.environ.get("HGENCODING") or locale.getpreferredencoding() \
or "ascii"
@@ -693,7 +692,7 @@ def checkfolding(path):
# Platform specific variants
if os.name == 'nt':
- demandload(globals(), "msvcrt")
+ import msvcrt
nulldev = 'NUL:'
class winstdout: