diff --git a/server/eit/commands/key.py b/server/eit/commands/key.py index 85f3cdcea..2cc9f6ac7 100644 --- a/server/eit/commands/key.py +++ b/server/eit/commands/key.py @@ -120,6 +120,10 @@ package and repository files through *gnupg*. sys.stderr.write("%s\n" % (err,)) return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._nsargs = nsargs return self._call_locked, [nsargs.func, nsargs.repo] diff --git a/server/eit/commands/notice.py b/server/eit/commands/notice.py index c944b70ee..4dea37d74 100644 --- a/server/eit/commands/notice.py +++ b/server/eit/commands/notice.py @@ -88,6 +88,10 @@ list notice-board titles for user consumption. except IOError: return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._repository_id = nsargs.repo return self._call_locked, [nsargs.func, self._repository_id] diff --git a/server/eit/commands/query.py b/server/eit/commands/query.py index c1b83907c..2f3e14717 100644 --- a/server/eit/commands/query.py +++ b/server/eit/commands/query.py @@ -159,6 +159,10 @@ tools. sys.stderr.write("%s\n" % (err,)) return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._repository_id = nsargs.inrepo self._quiet = nsargs.quiet self._verbose = getattr(nsargs, "verbose", self._verbose) diff --git a/server/eit/commands/remote.py b/server/eit/commands/remote.py index 1c9818055..8a533c5f3 100644 --- a/server/eit/commands/remote.py +++ b/server/eit/commands/remote.py @@ -85,6 +85,10 @@ Manage (add, remove, list) configured repositories. sys.stderr.write("%s\n" % (err,)) return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._nsargs = nsargs return self._call_locked, [nsargs.func, None] diff --git a/server/eit/commands/repo.py b/server/eit/commands/repo.py index fd92ba032..bc7b995c4 100644 --- a/server/eit/commands/repo.py +++ b/server/eit/commands/repo.py @@ -107,6 +107,10 @@ Manage Entropy Server Repositories. sys.stderr.write("%s\n" % (err,)) return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._nsargs = nsargs return self._call_locked, [nsargs.func, None] diff --git a/server/eit/commands/test.py b/server/eit/commands/test.py index dc19ea386..c6c158bc3 100644 --- a/server/eit/commands/test.py +++ b/server/eit/commands/test.py @@ -108,6 +108,10 @@ Toolset containing all the Entropy Server built-in QA tests available. except IOError as err: return parser.print_help, [] + # Python 3.3 bug #16308 + if not hasattr(nsargs, "func"): + return parser.print_help, [] + self._nsargs = nsargs return self._call_locked, [nsargs.func, None]