Patchwork [5,of,6,V2] tests: use print_function in test-hgweb-auth.py

login
register
mail settings
Submitter roby roby
Date April 3, 2016, 10:53 p.m.
Message ID <ef602b6377c790e980d3.1459724023@roby>
Download mbox | patch
Permalink /patch/14304/
State Accepted
Headers show

Comments

roby roby - April 3, 2016, 10:53 p.m.
# HG changeset patch
# User Robert Stanca <robert.stanca7@gmail.com>
# Date 1459722681 -10800
#      Mon Apr 04 01:31:21 2016 +0300
# Node ID ef602b6377c790e980d3a08a6943169188e58cc4
# Parent  53eec7dd8268f7d5ea8363dff3e3d0947f1b43cb
tests: use print_function in test-hgweb-auth.py

Patch

diff -r 53eec7dd8268 -r ef602b6377c7 tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t	Mon Apr 04 00:55:36 2016 +0300
+++ b/tests/test-check-py3-compat.t	Mon Apr 04 01:31:21 2016 +0300
@@ -56,7 +56,6 @@ 
   tests/test-demandimport.py not using absolute_import
   tests/test-demandimport.py requires print_function
   tests/test-doctest.py not using absolute_import
-  tests/test-hgweb-auth.py requires print_function
   tests/test-hgwebdir-paths.py not using absolute_import
   tests/test-hybridencode.py not using absolute_import
   tests/test-hybridencode.py requires print_function
@@ -214,7 +213,6 @@ 
   mercurial/wireproto.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
   tests/readlink.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-demandimport.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  tests/test-hgweb-auth.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-hybridencode.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-lrucachedict.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-minirst.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob)
diff -r 53eec7dd8268 -r ef602b6377c7 tests/test-hgweb-auth.py
--- a/tests/test-hgweb-auth.py	Mon Apr 04 00:55:36 2016 +0300
+++ b/tests/test-hgweb-auth.py	Mon Apr 04 01:31:21 2016 +0300
@@ -1,4 +1,4 @@ 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 try:
     import urllib2
@@ -35,7 +35,7 @@ 
                             for k in sorted(dict.iterkeys())]) + '}'
 
 def test(auth, urls=None):
-    print 'CFG:', dumpdict(auth)
+    print('CFG:', dumpdict(auth))
     prefixes = set()
     for k in auth:
         prefixes.add(k.split('.', 1)[0])
@@ -48,15 +48,15 @@ 
     ui = writeauth(auth)
 
     def _test(uri):
-        print 'URI:', uri
+        print('URI:', uri)
         try:
             pm = url.passwordmgr(ui)
             u, authinfo = util.url(uri).authinfo()
             if authinfo is not None:
                 pm.add_password(*authinfo)
-            print '    ', pm.find_user_password('test', u)
+            print('    ', pm.find_user_password('test', u))
         except Abort:
-            print 'abort'
+            print('    ','abort')
 
     if not urls:
         urls = [
@@ -73,25 +73,25 @@ 
         _test(u)
 
 
-print '\n*** Test in-uri schemes\n'
+print('\n*** Test in-uri schemes\n')
 test({'x.prefix': 'http://example.org'})
 test({'x.prefix': 'https://example.org'})
 test({'x.prefix': 'http://example.org', 'x.schemes': 'https'})
 test({'x.prefix': 'https://example.org', 'x.schemes': 'http'})
 
-print '\n*** Test separately configured schemes\n'
+print('\n*** Test separately configured schemes\n')
 test({'x.prefix': 'example.org', 'x.schemes': 'http'})
 test({'x.prefix': 'example.org', 'x.schemes': 'https'})
 test({'x.prefix': 'example.org', 'x.schemes': 'http https'})
 
-print '\n*** Test prefix matching\n'
+print('\n*** Test prefix matching\n')
 test({'x.prefix': 'http://example.org/foo',
       'y.prefix': 'http://example.org/bar'})
 test({'x.prefix': 'http://example.org/foo',
       'y.prefix': 'http://example.org/foo/bar'})
 test({'x.prefix': '*', 'y.prefix': 'https://example.org/bar'})
 
-print '\n*** Test user matching\n'
+print('\n*** Test user matching\n')
 test({'x.prefix': 'http://example.org/foo',
       'x.username': None,
       'x.password': 'xpassword'},
@@ -112,10 +112,10 @@ 
      urls=['http://y@example.org/foo/bar'])
 
 def testauthinfo(fullurl, authurl):
-    print 'URIs:', fullurl, authurl
+    print('URIs:', fullurl, authurl)
     pm = httppasswordmgrwithdefaultrealm()
     pm.add_password(*util.url(fullurl).authinfo()[1])
-    print pm.find_user_password('test', authurl)
+    print(pm.find_user_password('test', authurl))
 
-print '\n*** Test urllib2 and util.url\n'
+print('\n*** Test urllib2 and util.url\n')
 testauthinfo('http://user@example.com:8080/foo', 'http://example.com:8080/foo')