From 4aeb9cd53a414194ecf58301af3d392bf7fb0b71 Mon Sep 17 00:00:00 2001 From: Arghad Arnaout Date: Sun, 13 Sep 2015 22:03:35 +0200 Subject: [PATCH 1/2] Fixing PythonApplication1.py --- HelloWorld/HelloWorld.sln | 4 ++-- HelloWorld/HelloWorld/HelloWorld.pyproj | 9 +++++-- .../PythonApplication1/PythonApplication1.py | 24 +++++++++---------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/HelloWorld/HelloWorld.sln b/HelloWorld/HelloWorld.sln index b9d8311..945844b 100644 --- a/HelloWorld/HelloWorld.sln +++ b/HelloWorld/HelloWorld.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "HelloWorld", "HelloWorld\HelloWorld.pyproj", "{9BAE4970-E29F-4902-BAE2-CD9CC8BE1DAF}" EndProject diff --git a/HelloWorld/HelloWorld/HelloWorld.pyproj b/HelloWorld/HelloWorld/HelloWorld.pyproj index 64eeee0..4e29b2f 100644 --- a/HelloWorld/HelloWorld/HelloWorld.pyproj +++ b/HelloWorld/HelloWorld/HelloWorld.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/PythonApplication1/PythonApplication1/PythonApplication1.py b/PythonApplication1/PythonApplication1/PythonApplication1.py index 86bc136..13b1e00 100644 --- a/PythonApplication1/PythonApplication1/PythonApplication1.py +++ b/PythonApplication1/PythonApplication1/PythonApplication1.py @@ -1,19 +1,19 @@ -import datetime +import datetime currentDate = datetime.datetime.today() -#print(currentDate.minute) -#print(currentDate) -#print(currentDate.month) -#print(currentDate.year) +print(currentDate.minute) +print(currentDate) +print(currentDate.month) +print(currentDate.year) -#print(currentDate.strftime('%d %b, %Y')) -#print(currentDate.strftime('%d %b %y')) +print(currentDate.strftime('%d %b, %Y')) +print(currentDate.strftime('%d %b %y')) -#userInput = input('Please enter your birthday (mm/dd/yyyy)') -#birthday = datetime.datetime.strptime(userInput, '%m/%d/%Y').date() -#print(birthday) +userInput = input('Please enter your birthday (mm/dd/yyyy)') +birthday = datetime.datetime.strptime(userInput, '%m/%d/%Y') +print(birthday) -#days = birthday - currentDate -#print(days.days) \ No newline at end of file +days = currentDate - birthday +print(days.days) \ No newline at end of file From 35c4f749d3027c42f905ddc02d5ddaad30ec267f Mon Sep 17 00:00:00 2001 From: Arghad Arnaout Date: Sun, 13 Sep 2015 22:20:02 +0200 Subject: [PATCH 2/2] Upgrade to VS015 --- .../Module12ReadingFromFiles.sln | 4 ++-- .../Module12ReadingFromFiles.pyproj | 9 +++++++-- .../__pycache__/helpers.cpython-35.pyc | Bin 0 -> 541 bytes Module13Functions/Module13Functions/helpers.py | 4 ++-- Module2DisplayingText/Module2DisplayingText.sln | 4 ++-- .../Module2DisplayingText.pyproj | 9 +++++++-- .../Module3StringsAndVariables.py | 4 +++- .../Module6MakingDecisionsWithCode.sln | 4 ++-- .../Module6MakingDecisionsWithCode.py | 5 +++-- .../Module6MakingDecisionsWithCode.pyproj | 9 +++++++-- PythonApplication2/PythonApplication2.sln | 4 ++-- .../PythonApplication2/PythonApplication2.pyproj | 9 +++++++-- PythonApplication3/PythonApplication3.sln | 4 ++-- .../PythonApplication3/PythonApplication3.pyproj | 9 +++++++-- .../module4WorkingWithNumbers.sln | 4 ++-- .../module4WorkingWithNumbers.pyproj | 9 +++++++-- 16 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 Module13Functions/Module13Functions/__pycache__/helpers.cpython-35.pyc diff --git a/Module12ReadingFromFiles/Module12ReadingFromFiles.sln b/Module12ReadingFromFiles/Module12ReadingFromFiles.sln index 69ed971..ec23ff7 100644 --- a/Module12ReadingFromFiles/Module12ReadingFromFiles.sln +++ b/Module12ReadingFromFiles/Module12ReadingFromFiles.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Module12ReadingFromFiles", "Module12ReadingFromFiles\Module12ReadingFromFiles.pyproj", "{28A10113-491D-4CD8-A1B0-E6C6B2F05C71}" EndProject diff --git a/Module12ReadingFromFiles/Module12ReadingFromFiles/Module12ReadingFromFiles.pyproj b/Module12ReadingFromFiles/Module12ReadingFromFiles/Module12ReadingFromFiles.pyproj index 8c7fad1..c740f9c 100644 --- a/Module12ReadingFromFiles/Module12ReadingFromFiles/Module12ReadingFromFiles.pyproj +++ b/Module12ReadingFromFiles/Module12ReadingFromFiles/Module12ReadingFromFiles.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/Module13Functions/Module13Functions/__pycache__/helpers.cpython-35.pyc b/Module13Functions/Module13Functions/__pycache__/helpers.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c8da9ba4848898788fe6179d3061df1e166fc6ed GIT binary patch literal 541 zcmZut!AiqG5S>kvw$@g~gLn|^HDCqtCL%(s(u1K;L#UOYLo6;W`=3~yd$c4pp2r_&m~eq6i*z#ICHS%{9&)fR>bKL*bLJ^~A(n!yYr z8^*3P!3ty4Q$z2gs~rs3v?z~jFbB}c*zm+)&fpQ?1|y@CVS?{?{&GK&snU6oaOpea zQiZ~I2B8qMhxHSox$I6urMq#-l|JaYR^_CkD0Nj2i-L=Y2oYvn`3=GEJVY-bZQSGY zx_=Oyr8?;6rR0jMU?{ZAqjI9tT=YgVk7bx;sfc@{nND&Moa4_a-`hVeg{e{hFbSU) zT&mq-RyAX;X`W(qdJ_Y%Rn}%5ChLeNM3endXd8+9O;TcTwMLqtKHq}eHsBIPAG^$R zS>+Tm7235ViCfupqB(0393oq$#H`T3T+vj(@heO&A@Z=9D3ko^C2^#Apm~^?laI^= Iv}e2i1rfn`6#xJL literal 0 HcmV?d00001 diff --git a/Module13Functions/Module13Functions/helpers.py b/Module13Functions/Module13Functions/helpers.py index a46040f..91155de 100644 --- a/Module13Functions/Module13Functions/helpers.py +++ b/Module13Functions/Module13Functions/helpers.py @@ -1,7 +1,7 @@ -def getNames(): +def getNames(): names = ['Christopher', 'Susan', 'Danny'] newName = input('Enter last guest: ') - names.append(newName) + names.append(newName) return names def printNames(names): diff --git a/Module2DisplayingText/Module2DisplayingText.sln b/Module2DisplayingText/Module2DisplayingText.sln index 5d5802d..c4bedba 100644 --- a/Module2DisplayingText/Module2DisplayingText.sln +++ b/Module2DisplayingText/Module2DisplayingText.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Module2DisplayingText", "Module2DisplayingText\Module2DisplayingText.pyproj", "{CDCBF0E2-08FB-4C74-96A8-11164A699C23}" EndProject diff --git a/Module2DisplayingText/Module2DisplayingText/Module2DisplayingText.pyproj b/Module2DisplayingText/Module2DisplayingText/Module2DisplayingText.pyproj index ee1045e..dda9508 100644 --- a/Module2DisplayingText/Module2DisplayingText/Module2DisplayingText.pyproj +++ b/Module2DisplayingText/Module2DisplayingText/Module2DisplayingText.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/Module3StringsAndVariables/Module3StringsAndVariables/Module3StringsAndVariables.py b/Module3StringsAndVariables/Module3StringsAndVariables/Module3StringsAndVariables.py index eadd633..772bd5c 100644 --- a/Module3StringsAndVariables/Module3StringsAndVariables/Module3StringsAndVariables.py +++ b/Module3StringsAndVariables/Module3StringsAndVariables/Module3StringsAndVariables.py @@ -1,8 +1,10 @@ -#Collect name from the user +#Collect name from the user name = input('What is your name? ') country = input('What country do you live in? ') country = country.upper() + + #Display the name #print(name) diff --git a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.sln b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.sln index 06a3758..1a72478 100644 --- a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.sln +++ b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Module6MakingDecisionsWithCode", "Module6MakingDecisionsWithCode\Module6MakingDecisionsWithCode.pyproj", "{A36ABA8D-5CC6-4DE8-84E1-6BF9041D7D6B}" EndProject diff --git a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.py b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.py index a0fbd76..43f2949 100644 --- a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.py +++ b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.py @@ -1,4 +1,4 @@ -#meanwhile earlier in the day +#meanwhile earlier in the day bestTeam = "senators" #if statements with strings @@ -18,4 +18,5 @@ #complex code here... if freeToaster : print("enjoy your toaster") -print("Have a nice day!") +else : + print("Have a nice day!") diff --git a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.pyproj b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.pyproj index e7eb063..be0fb8b 100644 --- a/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.pyproj +++ b/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode/Module6MakingDecisionsWithCode.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/PythonApplication2/PythonApplication2.sln b/PythonApplication2/PythonApplication2.sln index fb0e60e..825f2d0 100644 --- a/PythonApplication2/PythonApplication2.sln +++ b/PythonApplication2/PythonApplication2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "PythonApplication2", "PythonApplication2\PythonApplication2.pyproj", "{F8538EC8-0FF4-4A3D-8A21-ABB170848464}" EndProject diff --git a/PythonApplication2/PythonApplication2/PythonApplication2.pyproj b/PythonApplication2/PythonApplication2/PythonApplication2.pyproj index 5ff170f..8e40aa1 100644 --- a/PythonApplication2/PythonApplication2/PythonApplication2.pyproj +++ b/PythonApplication2/PythonApplication2/PythonApplication2.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/PythonApplication3/PythonApplication3.sln b/PythonApplication3/PythonApplication3.sln index 7b5341e..b72a613 100644 --- a/PythonApplication3/PythonApplication3.sln +++ b/PythonApplication3/PythonApplication3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "PythonApplication3", "PythonApplication3\PythonApplication3.pyproj", "{C9341719-1D4E-4CE1-B25C-D947C4F5A29B}" EndProject diff --git a/PythonApplication3/PythonApplication3/PythonApplication3.pyproj b/PythonApplication3/PythonApplication3/PythonApplication3.pyproj index d91c4a5..b4ca2e4 100644 --- a/PythonApplication3/PythonApplication3/PythonApplication3.pyproj +++ b/PythonApplication3/PythonApplication3/PythonApplication3.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,8 +21,13 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file diff --git a/module4WorkingWithNumbers/module4WorkingWithNumbers.sln b/module4WorkingWithNumbers/module4WorkingWithNumbers.sln index 25731e8..4280126 100644 --- a/module4WorkingWithNumbers/module4WorkingWithNumbers.sln +++ b/module4WorkingWithNumbers/module4WorkingWithNumbers.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "module4WorkingWithNumbers", "module4WorkingWithNumbers\module4WorkingWithNumbers.pyproj", "{F5ACBB51-6603-49B5-9C79-6C85BC5C3B4E}" EndProject diff --git a/module4WorkingWithNumbers/module4WorkingWithNumbers/module4WorkingWithNumbers.pyproj b/module4WorkingWithNumbers/module4WorkingWithNumbers/module4WorkingWithNumbers.pyproj index c11d790..1fdb6ea 100644 --- a/module4WorkingWithNumbers/module4WorkingWithNumbers/module4WorkingWithNumbers.pyproj +++ b/module4WorkingWithNumbers/module4WorkingWithNumbers/module4WorkingWithNumbers.pyproj @@ -1,5 +1,5 @@  - + Debug 2.0 @@ -21,9 +21,14 @@ true false + + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets + - + + \ No newline at end of file