Merge pull request #180 from Altlock/master

Number two is done

Author: freddiev4

Easy Challenges/Challenge 0002 Easy/solutions/solution.tcl

@@ -0,0 +1,18 @@
+if 0 {
+	Author: Altlock
+
+	Description: Calculation done with command line arguments.
+}
+
+# Get correct amount of arguments
+
+if {$argc != 3 && $argc != 4} {
+	puts "This script requires exactly 3 or 4 numbers to be put in."
+	puts "For example: (tclsh $argv0 160 5 39),"
+	puts "the calculation of the example is (160 % 5 + 39 = 39)."
+	puts "If you put in 4 numbers, the sum will be multiplied by that number."
+} elseif {$argc == 3} { ;#If correct amount, calculate
+	puts [expr [lindex $argv 0] % [lindex $argv 1] + [lindex $argv 2]]
+} else {
+	puts [expr ([lindex $argv 0] % [lindex $argv 1] + [lindex $argv 2]) * [lindex $argv 3]]
+}

Easy Challenges/Challenge #0208 [Easy] Culling Numbers/solutions/solution.c renamed to Easy Challenges/Challenge 0208 Easy - Culling Numbers/solutions/solution.c

@@ -0,0 +1,2 @@
+praw>=5.1.0
+pprint>=0.1

etc/requirements.txt

@@ -27,11 +27,11 @@ def get_current_week(num_challenges=1):
 		num_challenges = int(sys.argv[1])
 
 	r = praw.Reddit(user_agent="dailyprogrammer-challenges")
-	sub = r.get_subreddit("dailyprogrammer")
+	sub = r.subreddit("dailyprogrammer")
 
 	# retrieve generators for top posts
-	chals = sub.get_new(limit=num_challenges)
-	_chals = sub.get_new(limit=num_challenges)
+	chals = sub.new(limit=num_challenges)
+	_chals = sub.new(limit=num_challenges)
 
 	# get challenge titles & selftext
 	challenge_titles = [str(x.title) for x in chals]
@@ -63,10 +63,6 @@ def get_current_week(num_challenges=1):
 		os.system('mv solutions "{}"'.format(title_lst[i]))
 		logging.info("Created solutions directory")
 
-	logging.info("Started sending data script")
-	os.system("./send-data.sh")
-	logging.info("Finished sending data")
-
 
 # TODO: Move this to a separate file
 def get_all_challenges():

post-challenges.py

@@ -10,7 +10,7 @@
 
 import glob
 import os
-import regex
+import re
 
 # This script will run on the Easy Medium and Hard directories.