# HG changeset patch
# User Pulkit Goyal <7895pul...@gmail.com>
# Date 1474613335 -19800
#      Fri Sep 23 12:18:55 2016 +0530
# Node ID 73e8bbaae1e350f6aa7b621cf29fcaba5d6508b5
# Parent  85bd31515225e7fdf9bd88edde054db2c74a33f8
py3: handle os.environ() and os.environb() case

os.environ() on python3 accepts bytes, we need to use os.environb().
Wrote a class named osenviron which will deal with this. A todo is
left to handle the windows case.

diff -r 85bd31515225 -r 73e8bbaae1e3 mercurial/encoding.py
--- a/mercurial/encoding.py     Sun Aug 21 13:16:21 2016 +0900
+++ b/mercurial/encoding.py     Fri Sep 23 12:18:55 2016 +0530
@@ -9,14 +9,16 @@
 
 import array
 import locale
-import os
 import sys
 import unicodedata
 
 from . import (
     error,
+    pycompat,
 )
 
+environ = pycompat.osenviron()
+
 if sys.version_info[0] >= 3:
     unichr = chr
 
@@ -76,13 +78,13 @@
 }
 
 try:
-    encoding = os.environ.get("HGENCODING")
+    encoding = environ.get("HGENCODING")
     if not encoding:
         encoding = locale.getpreferredencoding() or 'ascii'
         encoding = _encodingfixers.get(encoding, lambda: encoding)()
 except locale.Error:
     encoding = 'ascii'
-encodingmode = os.environ.get("HGENCODINGMODE", "strict")
+encodingmode = environ.get("HGENCODINGMODE", "strict")
 fallbackencoding = 'ISO-8859-1'
 
 class localstr(str):
@@ -180,7 +182,7 @@
         raise error.Abort(k, hint="please check your locale settings")
 
 # How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
-wide = (os.environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
+wide = (environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
         and "WFA" or "WF")
 
 def colwidth(s):
diff -r 85bd31515225 -r 73e8bbaae1e3 mercurial/pycompat.py
--- a/mercurial/pycompat.py     Sun Aug 21 13:16:21 2016 +0900
+++ b/mercurial/pycompat.py     Fri Sep 23 12:18:55 2016 +0530
@@ -69,6 +69,19 @@
         self.__dict__[name] = obj = getattr(origin, item)
         return obj
 
+class osenviron(object):
+    def __init__(self):
+        self.__dict__ = {}
+
+    def __getattr__(self, name):
+        if sys.version_info[0] < 3:
+            return getattr(os.environ, name)
+        else:
+            try:
+                return getattr(os.environb, name)
+            except AttributeError:  #Windows case
+                pass #TODO: add windows case here
+
 httpserver = _pycompatstub()
 urlreq = _pycompatstub()
 urlerr = _pycompatstub()
diff -r 85bd31515225 -r 73e8bbaae1e3 tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t     Sun Aug 21 13:16:21 2016 +0900
+++ b/tests/test-check-py3-compat.t     Fri Sep 23 12:18:55 2016 +0530
@@ -17,89 +17,90 @@
   > | xargs $PYTHON3 contrib/check-py3-compat.py \
   > | sed 's/[0-9][0-9]*)$/*)/'
   doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *)
-  hgext/acl.py: error importing: <TypeError> str expected, not bytes (error at 
encoding.py:*)
-  hgext/automv.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/blackbox.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/bugzilla.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/censor.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/chgserver.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/children.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/churn.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/clonebundles.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/color.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/convert/bzr.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/common.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/convert/convcmd.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/convert/cvs.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/cvsps.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/darcs.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/filemap.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/convert/git.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/gnuarch.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/convert/hg.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/monotone.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/convert/p4.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/convert/subversion.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
+  hgext/acl.py: error importing: <TypeError> str expected, not bytes (error at 
i18n.py:*)
+  hgext/automv.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/blackbox.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/bugzilla.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/censor.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/chgserver.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/children.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/churn.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/clonebundles.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/color.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/convert/bzr.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/common.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/convert/convcmd.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/convert/cvs.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/cvsps.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/darcs.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/filemap.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/convert/git.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/gnuarch.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/convert/hg.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/monotone.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/convert/p4.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/convert/subversion.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
   hgext/convert/transport.py: error importing module: <ImportError> No module 
named 'svn.client' (line *)
-  hgext/eol.py: error importing: <TypeError> str expected, not bytes (error at 
encoding.py:*)
-  hgext/extdiff.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/factotum.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/fetch.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/fsmonitor/state.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> str 
expected, not bytes (error at encoding.py:*)
-  hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at 
encoding.py:*)
-  hgext/graphlog.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at 
encoding.py:*)
-  hgext/histedit.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/journal.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/keyword.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/largefiles/basestore.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/lfcommands.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/lfutil.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/largefiles/localstore.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/overrides.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/proto.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  hgext/largefiles/remotestore.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/reposetup.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/storefactory.py: error importing: <TypeError> str expected, 
not bytes (error at encoding.py:*)
-  hgext/largefiles/uisetup.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
+  hgext/eol.py: error importing: <TypeError> str expected, not bytes (error at 
i18n.py:*)
+  hgext/extdiff.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/factotum.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/fetch.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/fsmonitor/state.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/fsmonitor/watchmanclient.py: error importing: <TypeError> str 
expected, not bytes (error at i18n.py:*)
+  hgext/gpg.py: error importing: <TypeError> str expected, not bytes (error at 
i18n.py:*)
+  hgext/graphlog.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/hgk.py: error importing: <TypeError> str expected, not bytes (error at 
i18n.py:*)
+  hgext/histedit.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/journal.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/keyword.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/largefiles/basestore.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/lfcommands.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/lfutil.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/largefiles/localstore.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/overrides.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/proto.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  hgext/largefiles/remotestore.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/reposetup.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/storefactory.py: error importing: <TypeError> str expected, 
not bytes (error at i18n.py:*)
+  hgext/largefiles/uisetup.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
   hgext/largefiles/wirestore.py: error importing module: <SystemError> Parent 
module 'hgext.largefiles' not loaded, cannot perform relative import (line *)
-  hgext/mq.py: error importing: <TypeError> str expected, not bytes (error at 
encoding.py:*)
-  hgext/notify.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/pager.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/patchbomb.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/purge.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/rebase.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/record.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/relink.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/schemes.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/share.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/shelve.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/strip.py: error importing: <TypeError> str expected, not bytes (error 
at encoding.py:*)
-  hgext/transplant.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/win32mbcs.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  hgext/win32text.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/archival.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/bookmarks.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/branchmap.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/bundle2.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/bundlerepo.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  mercurial/byterange.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/changegroup.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  mercurial/changelog.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/cmdutil.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/commands.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/commandserver.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
-  mercurial/config.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/context.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/copies.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/crecord.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/dagparser.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/dagutil.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/destutil.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/dirstate.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/discovery.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
-  mercurial/dispatch.py: error importing: <TypeError> str expected, not bytes 
(error at encoding.py:*)
+  hgext/mq.py: error importing: <TypeError> str expected, not bytes (error at 
i18n.py:*)
+  hgext/notify.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/pager.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/patchbomb.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/purge.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/rebase.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/record.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/relink.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/schemes.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/share.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/shelve.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/strip.py: error importing: <TypeError> str expected, not bytes (error 
at i18n.py:*)
+  hgext/transplant.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/win32mbcs.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  hgext/win32text.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/archival.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/bookmarks.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/branchmap.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/bundle2.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/bundlerepo.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  mercurial/byterange.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/changegroup.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  mercurial/changelog.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/cmdutil.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/commands.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/commandserver.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
+  mercurial/config.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/context.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/copies.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/crecord.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/dagparser.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/dagutil.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/destutil.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/dirstate.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/discovery.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/dispatch.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
+  mercurial/encoding.py: error importing module: <TypeError> bytes expected, 
not str (line *)
   mercurial/exchange.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
   mercurial/extensions.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
   mercurial/fancyopts.py: error importing: <TypeError> str expected, not bytes 
(error at i18n.py:*)
@@ -176,5 +177,5 @@
   $ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \
   > | xargs $PYTHON3 contrib/check-py3-compat.py \
   > | sed 's/[0-9][0-9]*)$/*)/'
-  hgext/highlight/highlight.py: error importing: <TypeError> str expected, not 
bytes (error at encoding.py:*)
+  hgext/highlight/highlight.py: error importing: <TypeError> str expected, not 
bytes (error at i18n.py:*)
 #endif
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to