From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/
Date: Fri, 30 Dec 2011 17:11:15 +0000 (UTC) [thread overview]
Message-ID: <be41e707eea09113c3d1a7b4cf255b1044e48ef3.blueness@gentoo> (raw)
commit: be41e707eea09113c3d1a7b4cf255b1044e48ef3
Author: Arfrever <arfrever <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 17:10:44 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 17:10:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=be41e707
Delete some unused variables and imports.
Reported-By: Arfrever <arfrever <AT> gentoo.org>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
WebappConfig/config.py | 4 ++--
WebappConfig/content.py | 1 -
WebappConfig/filetype.py | 2 +-
WebappConfig/permissions.py | 8 ++++----
WebappConfig/sandbox.py | 8 +-------
WebappConfig/server.py | 2 +-
WebappConfig/worker.py | 1 -
WebappConfig/wrapper.py | 4 +---
8 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 4e176da..e4f4819 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -19,9 +19,9 @@
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, os.path, optparse, ConfigParser, re, shlex, socket, time
+import sys, os, os.path, ConfigParser, re, socket, time
-from ConfigParser import MAX_INTERPOLATION_DEPTH, DEFAULTSECT, \
+from ConfigParser import MAX_INTERPOLATION_DEPTH, \
ParsingError, InterpolationMissingOptionError, \
InterpolationSyntaxError, \
InterpolationDepthError
diff --git a/WebappConfig/content.py b/WebappConfig/content.py
index 1683387..c535e52 100644
--- a/WebappConfig/content.py
+++ b/WebappConfig/content.py
@@ -28,7 +28,6 @@ import md5, re, os, os.path
from WebappConfig.debug import OUT
from WebappConfig.permissions import PermissionMap
-import WebappConfig.wrapper as wrapper
# ========================================================================
# Content handler
diff --git a/WebappConfig/filetype.py b/WebappConfig/filetype.py
index 41aff8f..1de66ba 100644
--- a/WebappConfig/filetype.py
+++ b/WebappConfig/filetype.py
@@ -22,7 +22,7 @@ __version__ = "$Id: filetype.py 245 2006-01-13 16:57:29Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os.path, re
+import re
from WebappConfig.debug import OUT
diff --git a/WebappConfig/permissions.py b/WebappConfig/permissions.py
index 966c610..13b2c3f 100644
--- a/WebappConfig/permissions.py
+++ b/WebappConfig/permissions.py
@@ -217,14 +217,14 @@ def get_group(group):
try:
# Try to match the integer to a group id
gid = grp.getgrgid(ngroup)[2]
- except KeyError as e:
+ except KeyError:
pass
if gid == -1:
# No success yet. Try to match to the group name
try:
gid = grp.getgrnam(str(group))[2]
- except KeyError as e:
+ except KeyError:
raise KeyError('The given group "' + str(group)
+ '" does not exist!')
@@ -265,14 +265,14 @@ def get_user(user):
try:
# Try to match the integer to a user id
uid = pwd.getpwuid(nuser)[2]
- except KeyError as e:
+ except KeyError:
pass
if uid == -1:
# No success yet. Try to match to the user name
try:
uid = pwd.getpwnam(str(user))[2]
- except KeyError as e:
+ except KeyError:
raise KeyError('The given user "' + str(user)
+ '" does not exist!')
return uid
diff --git a/WebappConfig/sandbox.py b/WebappConfig/sandbox.py
index 10873fa..698a566 100644
--- a/WebappConfig/sandbox.py
+++ b/WebappConfig/sandbox.py
@@ -24,9 +24,7 @@ __version__ = "$Id: permissions.py 129 2005-11-06 12:46:31Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import os, os.path, string, time, sys
-
-from WebappConfig.debug import OUT
+import os, os.path, string, sys
# stolen from portage
if os.path.isdir("/proc/%i/fd" % os.getpid()):
@@ -152,10 +150,6 @@ class Sandbox:
@returns: Never returns (calls os.execve)
"""
- # If the process we're creating hasn't been given a name
- # assign it the name of the executable.
- opt_name = os.path.basename(binary[0])
-
# Set up the command's pipes.
my_fds = {}
# To protect from cases where direct assignment could
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index ab17bd9..5aece77 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -19,7 +19,7 @@
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, os.path, re
+import os, os.path
from WebappConfig.debug import OUT
from WebappConfig.worker import WebappRemove, WebappAdd
diff --git a/WebappConfig/worker.py b/WebappConfig/worker.py
index 0841f4a..d1ece72 100644
--- a/WebappConfig/worker.py
+++ b/WebappConfig/worker.py
@@ -26,7 +26,6 @@ __version__ = "$Id: worker.py 245 2006-01-13 16:57:29Z wrobel $"
import sys, os, os.path, shutil, stat, re
from WebappConfig.debug import OUT
-import WebappConfig.wrapper as wrapper
# ========================================================================
# Helper functions
diff --git a/WebappConfig/wrapper.py b/WebappConfig/wrapper.py
index 91185ff..e0d1e87 100644
--- a/WebappConfig/wrapper.py
+++ b/WebappConfig/wrapper.py
@@ -26,7 +26,7 @@ __version__ = "$Id: wrapper.py 283 2006-04-20 22:53:04Z wrobel $"
# Dependencies
# ------------------------------------------------------------------------
-import sys, os, types, string
+import os, types, string
from WebappConfig.debug import OUT
@@ -59,7 +59,6 @@ def config_protect(cat, pn, pvr, pm):
fi, fo, fe = os.popen3(cmd)
fi.close()
result_lines = fo.readlines()
- error_lines = fe.readlines()
fo.close()
fe.close()
@@ -105,7 +104,6 @@ def get_root(config):
fi, fo, fe = os.popen3(cmd)
fi.close()
result_lines = fo.readlines()
- error_lines = fe.readlines()
fo.close()
fe.close()
next reply other threads:[~2011-12-30 17:11 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-30 17:11 Anthony G. Basile [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-22 23:04 [gentoo-commits] proj/webapp-config:master commit in: WebappConfig/ Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2017-02-16 3:09 Devan Franchini
2016-05-12 12:42 Anthony G. Basile
2015-07-11 1:27 Devan Franchini
2015-07-03 4:50 Devan Franchini
2015-07-02 16:49 Devan Franchini
2015-06-19 22:38 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2015-06-19 19:52 Devan Franchini
2014-01-25 3:17 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-25 3:14 Devan Franchini
2014-01-02 1:47 Devan Franchini
2014-01-01 1:09 Devan Franchini
2013-10-29 19:13 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:40 Devan Franchini
2013-10-29 2:18 Devan Franchini
2013-10-29 2:18 Devan Franchini
2013-10-29 2:15 Devan Franchini
2013-10-10 0:35 Devan Franchini
2013-09-26 4:03 Devan Franchini
2013-09-26 3:44 Devan Franchini
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-09-24 18:20 Anthony G. Basile
2013-08-06 12:28 Anthony G. Basile
2013-08-06 11:00 Anthony G. Basile
2013-08-06 11:00 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-08-03 13:24 Anthony G. Basile
2013-04-22 0:52 Anthony G. Basile
2013-03-23 4:05 Anthony G. Basile
2013-03-14 2:19 Anthony G. Basile
2013-03-09 13:45 Anthony G. Basile
2013-02-12 3:40 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2012-06-29 13:00 Anthony G. Basile
2011-12-30 17:52 Anthony G. Basile
2011-12-30 17:50 Anthony G. Basile
2011-12-30 17:34 Anthony G. Basile
2011-12-30 17:23 Anthony G. Basile
2011-12-30 16:50 Anthony G. Basile
2011-12-30 16:42 Anthony G. Basile
2011-08-06 1:51 Anthony G. Basile
2011-06-14 15:23 Anthony G. Basile
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=be41e707eea09113c3d1a7b4cf255b1044e48ef3.blueness@gentoo \
--to=blueness@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox