Revert https://trac.osgeo.org/grass/changeset/64335

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64364 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/init/grass.py

@@ -70,8 +70,6 @@ create_new = None
 grass_gui = None
 exit_grass = None
 force_gislock_removal = None
-encoding = None
-
 
 def warning(text):
     sys.stderr.write(_("WARNING") + ': ' + text + os.linesep)
@@ -778,7 +776,7 @@ def set_language():
     import locale
     
     language = 'None' # Such string sometimes is present in wx file
-    global encoding
+    encoding = None
     
     # Override value is stored in wxGUI preferences file.
     # As it's the only thing required, we'll just grep it out.
@@ -1126,7 +1124,7 @@ def bash_startup():
     else:
         f.write("PS1='GRASS %s (%s):\w > '\n" % (grass_version, location_name))
     
-    f.write(("""grass_prompt() {
+    f.write("""grass_prompt() {
 	LOCATION="`g.gisenv get=GISDBASE,LOCATION_NAME,MAPSET separator='/'`"
 	if test -d "$LOCATION/grid3/G3D_MASK" && test -f "$LOCATION/cell/MASK" ; then
 		echo [%s]
@@ -1138,7 +1136,7 @@ def bash_startup():
 }
 PROMPT_COMMAND=grass_prompt\n""" % (_("2D and 3D raster MASKs present"),
                                     _("Raster MASK present"),
-                                    _("3D raster MASK present"))).encode(encoding))
+                                    _("3D raster MASK present")))
 
     # read environmental variables
     path = os.path.join(userhome, ".grass.bashrc") # left for backward compatibility