From addb956a07a15e008c0fc4febf890dc410111868 Mon Sep 17 00:00:00 2001
From: zrayn <zshooter@gmail.com>
Date: Thu, 2 Jun 2016 16:10:08 -0700
Subject: Removing changing user/group option

---
 pyramid/scripts/pserve.py | 66 -----------------------------------------------
 1 file changed, 66 deletions(-)

diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 9c9be2d38..ec7f31704 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -118,19 +118,6 @@ class PServeCommand(object):
         dest='verbose',
         help="Suppress verbose output")
 
-    if hasattr(os, 'setuid'):
-        # I don't think these are available on Windows
-        parser.add_option(
-            '--user',
-            dest='set_user',
-            metavar="USERNAME",
-            help="Set the user (usually only possible when run as root)")
-        parser.add_option(
-            '--group',
-            dest='set_group',
-            metavar="GROUP",
-            help="Set the group (usually only possible when run as root)")
-
     _scheme_re = re.compile(r'^[a-z][a-z]+:', re.I)
 
     _reloader_environ_key = 'PYTHON_RELOADER_SHOULD_RUN'
@@ -150,15 +137,6 @@ class PServeCommand(object):
         return parse_vars(restvars)
 
     def run(self):  # pragma: no cover
-        if not hasattr(self.options, 'set_user'):
-            # Windows case:
-            self.options.set_user = self.options.set_group = None
-
-        # @@: Is this the right stage to set the user at?
-        if self.options.set_user or self.options.set_group:
-            self.change_user_group(
-                self.options.set_user, self.options.set_group)
-
         if not self.args:
             self.out('You must give a config file')
             return 2
@@ -323,50 +301,6 @@ class PServeCommand(object):
             if self.options.verbose > 0:
                 self.out('%s %s %s' % ('-' * 20, 'Restarting', '-' * 20))
 
-    def change_user_group(self, user, group): # pragma: no cover
-        import pwd
-        import grp
-
-        self.out('''\
-The --user and --group options have been deprecated in Pyramid 1.6. They will
-be removed in a future release per Pyramid's deprecation policy. Please
-consider using a real process manager for your processes like Systemd, Circus,
-or Supervisor, all of which support process security.
-''')
-
-        uid = gid = None
-        if group:
-            try:
-                gid = int(group)
-                group = grp.getgrgid(gid).gr_name
-            except ValueError:
-                import grp
-                try:
-                    entry = grp.getgrnam(group)
-                except KeyError:
-                    raise ValueError(
-                        "Bad group: %r; no such group exists" % group)
-                gid = entry.gr_gid
-        try:
-            uid = int(user)
-            user = pwd.getpwuid(uid).pw_name
-        except ValueError:
-            try:
-                entry = pwd.getpwnam(user)
-            except KeyError:
-                raise ValueError(
-                    "Bad username: %r; no such user exists" % user)
-            if not gid:
-                gid = entry.pw_gid
-            uid = entry.pw_uid
-        if self.options.verbose > 0:
-            self.out('Changing user to %s:%s (%s:%s)' % (
-                user, group or '(unknown)', uid, gid))
-        if gid:
-            os.setgid(gid)
-        if uid:
-            os.setuid(uid)
-
 class LazyWriter(object):
 
     """
-- 
cgit v1.2.3