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

merge 3.28 into 3.29

--HG--
branch : 3.29
Pipeline #63616 passed with stages
in 35 minutes and 26 seconds
from __future__ import absolute_import
import webtest import webtest
from cubicweb.wsgi import handler from cubicweb.wsgi import handler
......
from __future__ import absolute_import
import markdown import markdown
import logging import logging
......
...@@ -3,7 +3,7 @@ if confirm('use Europe/Paris as timezone?'): ...@@ -3,7 +3,7 @@ if confirm('use Europe/Paris as timezone?'):
else: else:
import pytz import pytz
while True: while True:
timezone = raw_input('enter your timezone') timezone = input('enter your timezone')
if timezone in pytz.common_timezones: if timezone in pytz.common_timezones:
break break
......
...@@ -26,7 +26,7 @@ from cubicweb.server.utils import crypt_password ...@@ -26,7 +26,7 @@ from cubicweb.server.utils import crypt_password
if __args__: if __args__:
login = __args__.pop() login = __args__.pop()
else: else:
login = raw_input("login? ") login = input("login? ")
rset = rql('Any U WHERE U is CWUser, U login %(login)s', {'login': login}) rset = rql('Any U WHERE U is CWUser, U login %(login)s', {'login': login})
......
from __future__ import print_function
try: try:
rtype, = __args__ rtype, = __args__
except ValueError: except ValueError:
......
from __future__ import print_function
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
try: try:
uri, newdn = __args__ uri, newdn = __args__
...@@ -12,7 +10,7 @@ olddn = repo.source_by_uri(uri).config['user-base-dn'] ...@@ -12,7 +10,7 @@ olddn = repo.source_by_uri(uri).config['user-base-dn']
assert olddn != newdn 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", for eid, olduserdn in rql("Any X, XURI WHERE X cwuri XURI, X cw_source S, S name %(name)s",
{'name': uri}): {'name': uri}):
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>. # with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
"""Some utilities for CubicWeb server/clients.""" """Some utilities for CubicWeb server/clients."""
from __future__ import division
import base64 import base64
import decimal import decimal
import datetime import datetime
......
...@@ -149,6 +149,9 @@ class ErrorView(AnyRsetView): ...@@ -149,6 +149,9 @@ class ErrorView(AnyRsetView):
w(u"<b>Cube %s version:</b> %s<br/>\n" % (cube, cubeversion)) w(u"<b>Cube %s version:</b> %s<br/>\n" % (cube, cubeversion))
cversions.append((cube, cubeversion)) cversions.append((cube, cubeversion))
w(u"</div>") w(u"</div>")
else:
eversion = self._cw._('no version information')
cversions = []
# creates a bug submission link if submit-mail is set # creates a bug submission link if submit-mail is set
if self._cw.vreg.config['submit-mail']: if self._cw.vreg.config['submit-mail']:
form = self._cw.vreg['forms'].select('base', self._cw, rset=None, 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