diff options
| -rw-r--r-- | python.html.markdown | 4 | ||||
| -rw-r--r-- | python3.html.markdown | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/python.html.markdown b/python.html.markdown index 13cb25e3..70f7f73f 100644 --- a/python.html.markdown +++ b/python.html.markdown @@ -726,7 +726,11 @@ print say(say_please=True) # Can you buy me a beer? Please! I am poor :( * [Python Module of the Week](http://pymotw.com/2/) * [A Crash Course in Python for Scientists](http://nbviewer.ipython.org/5920182) * [First Steps With Python](https://realpython.com/learn/python-first-steps/) +<<<<<<< HEAD +* [LearnPython](http://www.learnpython.org/) +======= * [Fullstack Python](https://www.fullstackpython.com/) +>>>>>>> adambard/master ### Dead Tree diff --git a/python3.html.markdown b/python3.html.markdown index 31b5bbe1..ff531b17 100644 --- a/python3.html.markdown +++ b/python3.html.markdown @@ -780,6 +780,7 @@ print(say(say_please=True)) # Can you buy me a beer? Please! I am poor :( * [A curated list of awesome Python frameworks, libraries and software](https://github.com/vinta/awesome-python) * [30 Python Language Features and Tricks You May Not Know About](http://sahandsaba.com/thirty-python-language-features-and-tricks-you-may-not-know.html) * [Official Style Guide for Python](https://www.python.org/dev/peps/pep-0008/) +* [Python 3 Computer Science Circles](http://cscircles.cemc.uwaterloo.ca/) ### Dead Tree |