Commit f5c880d5 authored by Nicolas Chauvat's avatar Nicolas Chauvat
Browse files

fix previous merge

- renaming raw_input to input
- removing from __future__ import
- web/views/management.py

--HG--
branch : 3.28
parent 4daaee7e63ae
Pipeline #63611 passed with stages
in 25 minutes and 8 seconds
from __future__ import absolute_import
import webtest
from cubicweb.wsgi import handler
......
from __future__ import absolute_import
import markdown
import logging
......
......@@ -3,7 +3,7 @@ if confirm('use Europe/Paris as timezone?'):
else:
import pytz
while True:
timezone = raw_input('enter your timezone')
timezone = input('enter your timezone')
if timezone in pytz.common_timezones:
break
......
......@@ -26,7 +26,7 @@ from cubicweb.server.utils import crypt_password
if __args__:
login = __args__.pop()
else:
login = raw_input("login? ")
login = input("login? ")
rset = rql('Any U WHERE U is CWUser, U login %(login)s', {'login': login})
......
from __future__ import print_function
try:
rtype, = __args__
except ValueError:
......
from __future__ import print_function
from base64 import b64decode, b64encode
try:
uri, newdn = __args__
......@@ -12,7 +10,7 @@ olddn = repo.source_by_uri(uri).config['user-base-dn']
assert olddn != newdn
raw_input("Ensure you've stopped the instance, type enter when done.")
input("Ensure you've stopped the instance, type enter when done.")
for eid, olduserdn in rql("Any X, XURI WHERE X cwuri XURI, X cw_source S, S name %(name)s",
{'name': uri}):
......
......@@ -17,8 +17,6 @@
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
"""Some utilities for CubicWeb server/clients."""
from __future__ import division
import base64
import decimal
import datetime
......
......@@ -149,6 +149,9 @@ class ErrorView(AnyRsetView):
w(u"<b>Cube %s version:</b> %s<br/>\n" % (cube, cubeversion))
cversions.append((cube, cubeversion))
w(u"</div>")
else:
eversion = self._cw._('no version information')
cversions = []
# creates a bug submission link if submit-mail is set
if self._cw.vreg.config['submit-mail']:
form = self._cw.vreg['forms'].select('base', self._cw, rset=None,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment