Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 30639:ad15646dc61c
py3: replace os.environ with encoding.environ (part 1 of 5)
os.environ is a dictionary which has string elements on Python 3. We have
encoding.environ which take care of all these things. This is the first patch
of 5 patch series which tend to replace the occurences of os.environ with
encoding.environ as using os.environ will result in unusual behaviour.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 18 Dec 2016 01:34:41 +0530 |
| parents | f8c9a7d2bbbf |
| children | 4c0a5a256ae8 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Tue Dec 20 20:28:41 2016 -0800 +++ b/mercurial/localrepo.py Sun Dec 18 01:34:41 2016 +0530 @@ -499,8 +499,8 @@ @storecache('00changelog.i') def changelog(self): c = changelog.changelog(self.svfs) - if 'HG_PENDING' in os.environ: - p = os.environ['HG_PENDING'] + if 'HG_PENDING' in encoding.environ: + p = encoding.environ['HG_PENDING'] if p.startswith(self.root): c.readpending('00changelog.i.a') return c @@ -1299,7 +1299,7 @@ # the contents of parentenvvar are used by the underlying lock to # determine whether it can be inherited if parentenvvar is not None: - parentlock = os.environ.get(parentenvvar) + parentlock = encoding.environ.get(parentenvvar) try: l = lockmod.lock(vfs, lockname, 0, releasefn=releasefn, acquirefn=acquirefn, desc=desc,