# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1145948409 -7200
# Node ID 3610d9468b1ebed1710f2d9e40e0c990c4c2a475
# Parent  27fd8b7a6c51edb6f5a4c7b43b257e1aae75dd62
Use string literal concatenation for optlist and import -p option

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2566,8 +2566,8 @@ def serve(ui, repo, **opts):
                 r = repo.addchangegroup(fin)
                 respond(str(r))
 
-    optlist = """name templates style address port
-                 ipv6 accesslog errorlog webdir_conf"""
+    optlist = ("name templates style address port ipv6"
+               " accesslog errorlog webdir_conf")
     for o in optlist.split():
         if opts[o]:
             ui.setconfig("web", o, opts[o])
@@ -2998,8 +2998,8 @@ table = {
     "import|patch":
         (import_,
          [('p', 'strip', 1,
-           _('directory strip option for patch. This has the same\n') +
-           _('meaning as the corresponding patch option')),
+           _('directory strip option for patch. This has the same\n'
+             'meaning as the corresponding patch option')),
           ('b', 'base', '', _('base path')),
           ('f', 'force', None,
            _('skip check for outstanding uncommitted changes'))],