Revert "non-portable stdlib imports to function scope"

This reverts commit 89529f3.

need additional branching, mac has fcntl, but not atomic pipe2() like bsd/linux

gunicorn/arbiter.py

@@ -175,8 +175,8 @@ def init_signals(self):
             os.close(p)
 
         # initialize the pipe
-        self.PIPE = os.pipe2(os.O_NONBLOCK | os.O_CLOEXEC)
-        for p in self.PIPE:
+        self.PIPE = pair = os.pipe()
+        for p in pair:
             util.set_non_blocking(p)
             util.close_on_exec(p)
 

gunicorn/config.py

@@ -6,8 +6,10 @@
 
 import argparse
 import copy
+import grp
 import inspect
 import os
+import pwd
 import re
 import shlex
 import ssl
@@ -440,9 +442,7 @@ def _validate_callable(val):
 
 def validate_user(val):
     if val is None:
-        return None
-
-    import pwd
+        return os.geteuid()
     if isinstance(val, int):
         return val
     elif val.isdigit():
@@ -456,9 +456,8 @@ def validate_user(val):
 
 def validate_group(val):
     if val is None:
-        return None
+        return os.getegid()
 
-    import grp
     if isinstance(val, int):
         return val
     elif val.isdigit():
@@ -1141,7 +1140,8 @@ class User(Setting):
     cli = ["-u", "--user"]
     meta = "USER"
     validator = validate_user
-    default = None
+    default = os.geteuid()
+    default_doc = "``os.geteuid()``"
     desc = """\
         Switch worker processes to run as this user.
 
@@ -1157,7 +1157,8 @@ class Group(Setting):
     cli = ["-g", "--group"]
     meta = "GROUP"
     validator = validate_group
-    default = None
+    default = os.getegid()
+    default_doc = "``os.getegid()``"
     desc = """\
         Switch worker process to run as this group.
 

gunicorn/util.py

@@ -4,12 +4,14 @@
 import ast
 import email.utils
 import errno
+import fcntl
 import html
 import importlib
 import inspect
 import io
 import logging
 import os
+import pwd
 import random
 import re
 import socket
@@ -131,15 +133,13 @@ def get_arity(f):
 
 
 def get_username(uid):
-    import pwd
     """ get the username for a user id"""
     return pwd.getpwuid(uid).pw_name
 
 
 def set_owner_process(uid, gid, initgroups=False):
     """ set user and group of workers processes """
 
-    # FIXME: odd inconsistency with 0/None
     if gid:
         if uid:
             try:
@@ -161,10 +161,6 @@ def set_owner_process(uid, gid, initgroups=False):
 
 
 def chown(path, uid, gid):
-    # we use None for unchanged
-    # os.chown semantics are -1 for unchanged
-    uid = -1 if uid is None else uid
-    gid = -1 if gid is None else gid
     os.chown(path, uid, gid)
 
 
@@ -259,25 +255,14 @@ def parse_address(netloc, default_port='8000'):
 
 
 def close_on_exec(fd):
-    # Python 3.4+: file descriptors created by Python non-inheritable by default
-    import fcntl
     flags = fcntl.fcntl(fd, fcntl.F_GETFD)
-    # mind the difference between os.O_CLOEXEC and fcntl.FD_CLOEXEC
-    if not flags | fcntl.FD_CLOEXEC:
-        raise AssertionError("Expected FD_CLOEXEC set on fd %r" % fd)
-    # flags |= fcntl.FD_CLOEXEC
-    # fcntl.fcntl(fd, fcntl.F_SETFD, flags)
+    flags |= fcntl.FD_CLOEXEC
+    fcntl.fcntl(fd, fcntl.F_SETFD, flags)
 
 
 def set_non_blocking(fd):
-    # no need for portability: on Unix it can be set atomically using os.pipe2()
-    #  or we want a queue or socket instead of a pipe anyway
-    import fcntl
-    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
-    if not flags | os.O_NONBLOCK:
-        raise AssertionError("Expected O_NONBLOCK set on fd %r" % fd)
-    # flags |= os.O_NONBLOCK
-    # fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+    flags = fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK
+    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
 
 
 def close(sock):

gunicorn/workers/base.py

@@ -100,7 +100,7 @@ def init_process(self):
         util.seed()
 
         # For waking ourselves up
-        self.PIPE = os.pipe2(os.O_NONBLOCK | os.O_CLOEXEC)
+        self.PIPE = os.pipe()
         for p in self.PIPE:
             util.set_non_blocking(p)
             util.close_on_exec(p)

tests/test_config.py

@@ -88,8 +88,8 @@ def test_property_access():
     assert c.address == [("127.0.0.1", 8000)]
 
     # User and group defaults
-    assert c.uid is None
-    assert c.gid is None
+    assert os.geteuid() == c.uid
+    assert os.getegid() == c.gid
 
     # Proc name
     assert "gunicorn" == c.proc_name