Default port depends on ssl flag.

1 files changed, 9 insertions, 3 deletions

diff --git a/main.py b/main.py
index 829e1f4..202cdce 100644
--- a/main.py
+++ b/main.py
@@ -9,6 +9,7 @@ Some incomplete laundry lists:
 
 TODO:
 - Take test urls from command line.
+- Move urlfetch to a separate module.
 - Profiling.
 - Docstrings.
 - Unittests.
@@ -35,9 +36,14 @@ import scheduling
 import sockets
 
 
-def urlfetch(host, port=80, method='GET', path='/',
+def urlfetch(host, port=None, method='GET', path='/',
              body=None, hdrs=None, encoding='utf-8', ssl=None, af=0):
     t0 = time.time()
+    if port is None:
+        if ssl:
+            port = 443
+        else:
+            port = 80
     trans = yield from sockets.create_transport(host, port, ssl=ssl, af=af)
     yield from trans.send(method.encode(encoding) + b' ' +
                           path.encode(encoding) + b' HTTP/1.0\r\n')
@@ -113,7 +119,7 @@ def doit():
     tasks.add(task3)
 
     # Fetch XKCD home page using SSL.  (Doesn't like IPv6.)
-    task4 = scheduling.Task(urlfetch('xkcd.com', 443, path='/',
+    task4 = scheduling.Task(urlfetch('xkcd.com', ssl=True, path='/',
                                      af=socket.AF_INET),
                             'xkcd', timeout=TIMEOUT)
     tasks.add(task4)
@@ -133,7 +139,7 @@ def doit():
     scheduling.run()
 ##     print(tasks)
     for t in tasks:
-        print(t.name + ':', t.exception or t.result)
+        print(t.name + ':', repr(t.exception) if t.exception else t.result)
 
 
 def logtimes(real):