testpython.git

@@ -3,6 +3,8 @@

 This is just a test project. You can do anything here, test python

 and IDE projects.

+This branch is of Python 3 code. There's a python2 branch too.

+

 ### Getting the project

 You can get a copy of this project by clicking on the

@@ -1,13 +1,11 @@

-#!/usr/bin/env python

-# From https://dl.dropboxusercontent.com/u/3967849/pyru/_build/html/threading.html

-from __future__ import print_function

-import threading, Queue

+#!/usr/bin/env python3

+# From https://pybay.com/site_media/slides/raymond2017-keynote/threading.html

+import threading, queue

-#############################################################################

 _counter = 0

-counter_queue = Queue.Queue()

+counter_queue = queue.Queue()

 def counter_manager():

     'I have EXCLUSIVE rights to update the _counter variable'

@@ -21,9 +19,8 @@ def counter_manager():

             '---------------'])

         counter_queue.task_done()

-#############################################################################

-print_queue = Queue.Queue()

+print_queue = queue.Queue()

 def print_manager():

     'I have EXCLUSIVE rights to call the "print" keyword'

@@ -33,7 +30,6 @@ def print_manager():

             print(line)

         print_queue.task_done()

-#############################################################################

 def worker():

     'My job is to increment the counter and print the current count'

@@ -1,7 +1,7 @@

-#!/usr/bin/env python

-# https://dl.dropboxusercontent.com/u/3967849/pyru/_build/html/process.html

-from __future__ import print_function

-import urllib

+#!/usr/bin/env python3

+# From https://pybay.com/site_media/slides/raymond2017-keynote/process.html

+import urllib.request

+import urllib.error

 sites = [

 #    'https://www.yahoo.com/',

@@ -9,7 +9,7 @@ sites = [

 #    'http://www.python.org',

 #    'http://www.jython.org',

     'http://www.pypy.org',

-#    'http://www.perl.org',

+    'http://www.perl.org',

 #    'http://www.cisco.com',

 #    'http://www.facebook.com',

 #    'http://www.twitter.com',

@@ -21,13 +21,14 @@ sites = [

 ]

-def sitesize(url):

+def sitesize(url: str):

     ''' Determine the size of a website '''

-    # TODO: Use requests instead, or migrate to python3

-    f = urllib.urlopen(url)  # Could use "with" in python3

+    try:

+        with urllib.request.urlopen(url) as f:

             page = f.read()

-    f.close()

         return url, len(page)

+    except urllib.error.HTTPError as e:

+        return url, str(e)

 def run():

@@ -1,8 +1,7 @@

-#!/usr/bin/env python

+#!/usr/bin/env python3

 # -*- coding: utf-8 -*-

 #

 # "Hello Friends" in Chinese: 朋友你好

-from __future__ import print_function

 import os

 import sys

 import time

@@ -11,7 +10,7 @@ import counter.counter

 import sitesize.sitesize

-def set_v_print(verbose):

+def set_v_print(verbose: bool):

     """

     Defines the function v_print.

     It prints if verbose is true, otherwise, it does nothing.

@@ -19,14 +18,10 @@ def set_v_print(verbose):

     :param verbose: A bool to determine if v_print will print its args.

     """

     global v_print

-    if verbose:

-        def v_print(*s):

-            print(' '.join([i.encode('utf8') for i in s]))

-    else:

-        v_print = lambda *s: None

+    v_print = print if verbose else lambda *a, **k: None

-def main(debug):

+def main(debug: bool):

     start_time = time.time()

     localdir = os.path.abspath(os.path.dirname(sys.argv[0]))

     v_print("Running counter...")