Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/util.py @ 3887:79e5a6e7c451
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 14 Dec 2006 13:49:33 -0800 |
parents | abaee83ce0a6 |
children | 6b4127c7d52a |
line wrap: on
line diff
--- 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: