updated for python3

Author: mjhea0

.gitignore

@@ -3,4 +3,5 @@ venv
 *.pyc
 .DS_STORE
 htmlcov
-.coverage
+.coverage
+__pycache__

README.md

@@ -2,6 +2,8 @@
 
 A simple test to show that a web developer knows how to use basic tools and understands the basics of the Python language.
 
+> Make sure your code is compatible with the [latest versions](https://www.python.org/downloads/) of Python 2 and 3. Thanks!
+
 ###  Tests
 
 Make sure to fork this repository and submit a pull request with the requested tasks completed.

part1/reverse_dubno/test_reverse.py

@@ -1,7 +1,7 @@
 from reverse_function import reverse
 
-print reverse('New York') == 'kroY weN'
-print reverse('bike') == 'ekib'
-print reverse('new') == 'wen'
-print reverse('work') == 'krow'
-print reverse('skate') != 'etak'
+print(reverse('New York') == 'kroY weN')
+print(reverse('bike') == 'ekib')
+print(reverse('new') == 'wen')
+print(reverse('work') == 'krow')
+print(reverse('skate') != 'etak')

part1/reverse_herman/reverse_string.py

@@ -1,5 +1,5 @@
 def reverse(string):
     result = ""
-    for letter in xrange(len(string), 0, -1):
+    for letter in range(len(string), 0, -1):
         result = result + string[letter-1]
     return result

part1/reverse_herman/test.py

@@ -1,9 +1,9 @@
 from reverse_string import reverse
 
 
-print reverse("tset") == "test"             # True
-print reverse("olleh") == "hello"           # True
-print reverse("nekcihc") == "chicken"       # True
-print reverse("neckihc") == "notchicken"    # False
-print reverse("abcdefghijklmnopqrstuvwxyz") == \
-    "zyxwvutsrqponmlkjihgfedcba"    # True
+print(reverse("tset") == "test")             # True
+print(reverse("olleh") == "hello")           # True
+print(reverse("nekcihc") == "chicken")       # True
+print(reverse("neckihc") == "notchicken")    # False
+print(reverse("abcdefghijklmnopqrstuvwxyz") ==
+      "zyxwvutsrqponmlkjihgfedcba")          # True

part1/reverse_norman/reverse_string.py

@@ -1,5 +1,5 @@
 def reverse(string):
     reverse_string = ""
-    for i in xrange(len(string)):
+    for i in range(len(string)):
         reverse_string = reverse_string + string[(len(string)-1)-i]
     return reverse_string

part1/reverse_norman/test.py

@@ -1,7 +1,7 @@
 from reverse_string import reverse
 
-print reverse('Hello World') == "dlroW olleH"         # True
-print reverse('eh') == 'he'                           # True
-print reverse('this is a TEST') == "TSET a si siht"   # True
-print reverse('football') == 'labtoof'                # False
-print reverse('False') == 'eslaf'                     # False
+print(reverse('Hello World') == "dlroW olleH")         # True
+print(reverse('eh') == 'he')                           # True
+print(reverse('this is a TEST') == "TSET a si siht")   # True
+print(reverse('football') == 'labtoof')                # False
+print(reverse('False') == 'eslaf')                     # False

part2/reverse_flask_herd/project/reverse_flask.py

@@ -2,7 +2,7 @@
 
 app = Flask(__name__)
 
-app.config['DEBUG'] = True
+app.config['DEBUG'] = False
 
 
 @app.route('/')

part2/reverse_flask_herd/tests_app.py

@@ -33,7 +33,7 @@ def test_reverse_string_page_renders(self):
             str_to_reverse=test_string)
         )
         self.assertEqual(response.status_code, 200)
-        self.assertIn(expected_string, response.data)
+        self.assertIn(expected_string, str(response.data))
 
 
 if __name__ == '__main__':

part2/reverse_flask_herman/reverse/__init__.py

@@ -4,7 +4,7 @@
 from flask import Flask, render_template, request, \
     flash, url_for, redirect
 
-from forms import ReverseStringForm
+from reverse.forms import ReverseStringForm
 
 
 ################
@@ -21,7 +21,7 @@
 
 def reverse(string):
     result = ""
-    for letter in xrange(len(string), 0, -1):
+    for letter in range(len(string), 0, -1):
         result = result + string[letter-1]
     return result
 

part2/reverse_flask_herman/reverse/forms.py

@@ -2,10 +2,10 @@
 
 
 from flask_wtf import Form
-from wtforms import TextField
+from wtforms import StringField
 from wtforms.validators import DataRequired, length
 
 
 class ReverseStringForm(Form):
-    reverse_string = TextField(
+    reverse_string = StringField(
         'Reverse', validators=[DataRequired(), length(min=2)])

part2/reverse_flask_herman/test.py

@@ -19,26 +19,26 @@ def test_index(self):
         # Ensure Flask is setup.
         response = self.app.get('/')
         self.assertEqual(response.status_code, 200)
-        self.assertIn('please enter some text to reverse...', response.data)
+        self.assertIn(b'please enter some text to reverse...', response.data)
 
     def test_text_is_reversed(self):
         # Ensure the '/reversed_input/<user_input>' route works.
         response = self.app.get('/reversed_input/FooBar')
-        self.assertIn('raBooF', response.data)
+        self.assertIn(b'raBooF', response.data)
 
     def test_form_error(self):
         # Ensure error is populated correctly.
         response = self.app.post('/', data=dict(
             reverse_string='', follow_redirects=True)
         )
-        self.assertIn('This field is required', response.data)
+        self.assertIn(b'This field is required', response.data)
 
     def test_functional(self):
         # Ensure form redirects and string is reversed.
         response = self.app.post('/', data=dict(
             reverse_string="Real Python",),  follow_redirects=True)
         self.assertEqual(response.status_code, 200)
-        self.assertIn('nohtyP laeR', response.data)
+        self.assertIn(b'nohtyP laeR', response.data)
 
 
 if __name__ == '__main__':

part2/reverse_flask_norman/project/__init__.py

@@ -1,13 +1,13 @@
 from flask import Flask, render_template, request, redirect, url_for
-from forms import ReverseForm
+from project.forms import ReverseForm
 
 app = Flask(__name__)
 app.config.from_object('project.config')
 
 
 def reverse(string):
     reverse_string = ""
-    for i in xrange(len(string)):
+    for i in range(len(string)):
         reverse_string = reverse_string + string[(len(string)-1)-i]
     return reverse_string
 

part2/reverse_flask_norman/project/forms.py

@@ -1,7 +1,7 @@
 from flask_wtf import Form
-from wtforms import TextField
+from wtforms import StringField
 from wtforms.validators import DataRequired
 
 
 class ReverseForm(Form):
-    reverse = TextField('Reverse', validators=[DataRequired()])
+    reverse = StringField('Reverse', validators=[DataRequired()])

part2/reverse_flask_norman/test.py

@@ -1,6 +1,6 @@
 # tests
 
-from project.app import app
+from project import app
 import unittest
 
 
@@ -16,24 +16,24 @@ def tearDown(self):
     def test_homepage_exists(self):
         response = self.app.get('/')
         self.assertEqual(response.status_code, 200)
-        self.assertIn('Reverse this text', response.data)
+        self.assertIn(b'Reverse this text', response.data)
 
     def test_text_is_reversed(self):
         response = self.app.get('/reversed_input/HelloWorld')
-        self.assertIn('dlroWolleH', response.data)
+        self.assertIn(b'dlroWolleH', response.data)
 
     def test_users_must_enter_string(self):
         response = self.app.post(
             '/',
             data=dict(reverse='', follow_redirects=True)
         )
-        self.assertIn('This field is required', response.data)
+        self.assertIn(b'This field is required', response.data)
 
     def test_redirects_to_output(self):
         response = self.app.post(
             '/',
             data=dict(reverse="Hello",),  follow_redirects=True)
-        self.assertIn('olleH', response.data)
+        self.assertIn(b'olleH', response.data)
 
 if __name__ == '__main__':
     unittest.main()

part2/reverse_flask_perham/test.py

@@ -29,11 +29,11 @@ def tearDown(self):
     # each test should start with 'test'
     def test_index_page_available(self):
         response = self.app.get('/')
-        self.assertIn("Enter a string:", response.data)
+        self.assertIn(b"Enter a string:", response.data)
 
     def test_submitted_word_reverses(self):
         response = self.app.post('/', data=dict(string='donkey'))
-        self.assertIn("yeknod", response.data)
+        self.assertIn(b"yeknod", response.data)
 
 if __name__ == "__main__":
     unittest.main()

requirements.txt

@@ -1,5 +1,7 @@
 Flask==0.10.1
+Flask-WTF==0.11
 Jinja2==2.7.3
 MarkupSafe==0.23
+WTForms==2.0.2
 Werkzeug==0.10.4
 itsdangerous==0.24