[cwctl] Kill deprecated ordered_instances method
no need to keep bw compat for this.
--- a/cubicweb/cwctl.py Fri Nov 18 18:15:14 2016 +0100
+++ b/cubicweb/cwctl.py Thu Nov 24 15:39:52 2016 +0100
@@ -1,4 +1,4 @@
-# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2016 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
@@ -103,13 +103,6 @@
)
actionverb = None
- @deprecated('[3.22] startorder is not used any more')
- def ordered_instances(self):
- """return list of known instances
- """
- regdir = cwcfg.instances_dir()
- return list_instances(regdir)
-
def run(self, args):
"""run the <command>_method on each argument (a list of instance
identifiers)
--- a/cubicweb/pyramid/pyramidctl.py Fri Nov 18 18:15:14 2016 +0100
+++ b/cubicweb/pyramid/pyramidctl.py Thu Nov 24 15:39:52 2016 +0100
@@ -15,7 +15,7 @@
import threading
import subprocess
-from cubicweb import BadCommandUsage, ExecutionError
+from cubicweb import ExecutionError
from cubicweb.cwconfig import CubicWebConfiguration as cwcfg
from cubicweb.cwctl import CWCTL, InstanceCommand, init_cmdline_log_threshold
from cubicweb.pyramid import wsgi_application_from_cwconfig
@@ -99,15 +99,6 @@
def info(self, msg):
print('INFO - %s' % msg)
- def ordered_instances(self):
- instances = super(PyramidStartHandler, self).ordered_instances()
- if (self['debug-mode'] or self['debug'] or self['reload']) \
- and len(instances) > 1:
- raise BadCommandUsage(
- '--debug-mode, --debug and --reload can be used on a single '
- 'instance only')
- return instances
-
def quote_first_command_arg(self, arg):
"""
There's a bug in Windows when running an executable that's