Fix a few Windows compatibility issues. (#718)

AcademySoftwareFoundation · Jun 20, 2020 · 7050e75 · 7050e75
1 parent 596d9a2
commit 7050e75
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/pyoutline/bin/cuerunbase.py b/pyoutline/bin/cuerunbase.py
@@ -134,7 +134,11 @@ def __init__(self):
  self.__evh = event.EventHandler(self)
 
  # Setup a sigbus signal handler.
- signal.signal(signal.SIGBUS, signal_handler)
+ try:
+ signal.signal(signal.SIGBUS, signal_handler)
+ except ValueError:
+ # Not every system implements SIGBUS.
+ pass
 
  def add_my_options(self):
  """Implemented by subclass."""

diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
@@ -215,9 +215,7 @@ def _serialize(launcher, use_pycuerun):
  if not launcher.get("nomail"):
  sub_element(root, "email", "%s@%s" % (user,
  config.get("outline", "domain")))
- uid = util.get_uid()
- if uid is not None:
- sub_element(root, "uid", str(uid))
+ sub_element(root, "uid", str(util.get_uid()))
 
  j = Et.SubElement(root, "job", {"name": ol.get_name()})
  sub_element(j, "paused", str(launcher.get("pause")))

diff --git a/pyoutline/outline/util.py b/pyoutline/outline/util.py
@@ -126,6 +126,6 @@ def get_uid():
  Return the current users id
  """
  if platform.system() == 'Windows':
- return None
+ return 1
 
  return os.getuid()
diff --git a/rqd/rqd/__main__.py b/rqd/rqd/__main__.py
@@ -78,6 +78,8 @@ def setupLogging():
  logfile = logging.handlers.SysLogHandler(address=syslogAddress)
  else:
  logfile = logging.handlers.SysLogHandler()
+ elif platform.system() == 'Windows':
+ logfile = logging.FileHandler(os.path.expandvars('%TEMP%/openrqd.log'))
  else:
  logfile = logging.handlers.SysLogHandler()
  logfile.setLevel(fileLevel)

diff --git a/rqd/rqd/rqcore.py b/rqd/rqd/rqcore.py
@@ -116,7 +116,7 @@ def _createCommandFile(self, command):
  rqd_tmp_dir = os.path.join(tempfile.gettempdir(), 'rqd')
  try:
  os.mkdir(rqd_tmp_dir)
- except FileExistsError:
+ except OSError:
  pass # okay, already exists
 
  commandFile = os.path.join(