Skip to content
This repository has been archived by the owner on Sep 14, 2023. It is now read-only.

Simplify the structure of the grass init module #7

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Simplify the structure of the grass init module #7

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
90639ae
lib/init/grass: Simplify removing the tmpdir.
pmav99 Feb 3, 2019
785492b
lib/init/grass: Fix erroneous comment.
pmav99 Feb 3, 2019
39d047b
lib/init/grass: Simplify encode()/decode() functions.
pmav99 Feb 3, 2019
e60e034
lib/init/grass: Move all the imports at the beginning of the file.
pmav99 Feb 3, 2019
47ff016
lib/init/grass: Simplify clean_env().
pmav99 Feb 3, 2019
193277d
lib/init/grass: Just shuffling stuff around
pmav99 Feb 3, 2019
821f43f
lib/init/grass: Group the logging functions together.
pmav99 Feb 3, 2019
3a5de69
lib/init/grass: Capitalize constants.
pmav99 Feb 3, 2019
906ff68
lib/init/grass: Move the info message out of the "show_info()" function.
pmav99 Feb 3, 2019
bb2d09e
lib/init/grass: Remove unused constants
pmav99 Feb 4, 2019
44ce258
lib/init/grass: Use six for cross version Python compatibility
pmav99 Feb 4, 2019
2c00830
lib/init/grass: Remove old comment
pmav99 Feb 4, 2019
d2ab2c2
lib/init/grass: Move all the gisbase stuff in a single place.
pmav99 Feb 4, 2019
7e737ee
lib/init/grass: Clarify comment.
pmav99 Feb 4, 2019
e5d0b31
lib/init/grass: Capitalize all constants
pmav99 Feb 4, 2019
d84f4c4
lib/init/grass: Fix typo
pmav99 Feb 4, 2019
6689f15
lib/init/grass: Simplify setting a value to CONFIG_PROJSHARE
pmav99 Feb 4, 2019
5682b16
lib/init/grass: Add comments about GISBASE
pmav99 Feb 4, 2019
070f9e1
lib/init/grass: Validate cmdline in a separate function
pmav99 Feb 4, 2019
520f4df
lib/init/grass: Inline variable substitution inside "help_message()"
pmav99 Feb 24, 2019
7229f5f
lib/init/grass: Ensure that the init process only happens inside main()
pmav99 Feb 24, 2019
1809611
lib/init/grass: Refuse to start if ~/.grass7 exists but is not a dire…
pmav99 Feb 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/init/grass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@
import sys
import os
import atexit
import gettext
import shutil
import signal
import string
import subprocess
import types
import re
import platform
import tempfile
Expand Down Expand Up @@ -114,7 +117,6 @@ def to_text_string(obj, encoding=ENCODING):


if PY2:
import types
string_types = basestring,
integer_types = (int, long)
class_types = (type, types.ClassType)
Expand Down Expand Up @@ -151,7 +153,6 @@ def to_text_string(obj, encoding=ENCODING):
gisbase = os.path.normpath(gisbase)

# i18N
import gettext
# TODO: is this needed or even desirable when we have set_language()?
gettext.install('grasslibs', os.path.join(gisbase, 'locale'))

Expand Down Expand Up @@ -1584,7 +1585,6 @@ def close_gui():
env = gcore.gisenv()
if 'GUI_PID' not in env:
return
import signal
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps minor speedup, but this is currently needed only for the GUI and in general we should minimize the overhead when grass.py is called in command line to do batch jobs. (import types is similar case, although not related to GUI vs batch) Just a note. I'm leaving it up to you.

for pid in env['GUI_PID'].split(','):
debug("Exiting GUI with pid={0}".format(pid))
try:
Expand Down