Merge branch 'master' into master

Author: jinyoungHan

Assembler/assembler.py

@@ -1,6 +1,4 @@
 import sys
-//WE NEED TSHIRT FOR HACKTOBER FEST.
-//PLEASE ACCEPT MY PR.
 
 lines = [] # contains the lines of the file. 
 tokens = [] # contains all tokens of the source code.

GroupSms_Way2.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import urllib2
 import cookielib
 from getpass import getpass
@@ -42,4 +43,4 @@
     print("Error while sending message")
 
 sys.exit(1)
-print "SMS has been sent."
+print("SMS has been sent.")

Organise.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import os
 import sys
 import shutil

Shivaansh.py

@@ -1,4 +1,5 @@
+from __future__ import print_function
 x = input("Enter a number: ")
 for i in range (1,11,1):
-  print x, "x", i, "=", (x * i)
+  print(x, "x", i, "=", (x * i))
 

binary coefficients

@@ -0,0 +1,21 @@
+def pascal_triangle( lineNumber ) :
+    list1 = list()
+    list1.append([1])
+    i=1
+    while(i<=lineNumber):
+        j=1
+        l=[]
+        l.append(1)
+        while(j<i):
+            
+            l.append(list1[i-1][j]+list1[i-1][j-1])
+            j=j+1
+        l.append(1)
+        list1.append(l)
+        i=i+1
+    return list1
+
+def binomial_coef(n,k):
+    pascalTriangle=pascal_triangle(n)
+    return(pascalTriangle[n][k-1])
+            

env_check.py

@@ -23,4 +23,4 @@
     if newenv is None:  # If it doesn't exist
         print(env_check, 'is not set')  # Print it is not set
     else:  # Else if it does exist
-        print('Current Setting for {}={}\n'.format(env_check, newenv)  # Print out the details)
+        print('Current Setting for {}={}\n'.format(env_check, newenv))  # Print out the details

get_likes_on_FB.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import urllib
 import json
 import sys
@@ -12,7 +13,7 @@
 data = json.load(urllib.urlopen(url))
 id=0
 
-print str(id)
+print(str(id))
 
 for item in data['data']:
    time=item['created_time'][11:19]
@@ -32,4 +33,4 @@
 
 id+=1
 
-print str(id)+'\t'+ time.encode('utf-8')+'\t'+date.encode('utf-8')+'\t'+year.encode('utf-8')+'\t'+ str(num_share)+'\t'+str(num_like)
+print(str(id)+'\t'+ time.encode('utf-8')+'\t'+date.encode('utf-8')+'\t'+year.encode('utf-8')+'\t'+ str(num_share)+'\t'+str(num_like))

merge.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # author:zhangshuyx@gmail.com
 
 #!/usr/bin/env python
@@ -32,8 +33,8 @@ def merge():
 # the main program
 
 def main():
-    print "\t\tMerge\n\n"
-    print "This program merges csv-files to one file\n"
+    print("\t\tMerge\n\n")
+    print("This program merges csv-files to one file\n")
     merge()
 
 if __name__ == '__main__':

new_script.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name	: new_script.py
 # Author			: Craig Richards
 # Created			: 20th November 2012
@@ -19,11 +20,11 @@
 	-sql	: SQL Script'''
 
 if len(sys.argv) < 3:
-  print text
+  print(text)
   sys.exit()
 
 if '-h' in sys.argv or '--h' in sys.argv or '-help' in sys.argv or '--help' in sys.argv:
-  print text
+  print(text)
   sys.exit()
 else:
   if '-python' in sys.argv[1]:
@@ -39,7 +40,7 @@
     config_file = "sql.cfg"
     extension = ".sql"
   else:
-    print 'Unknown option - ' + text
+    print('Unknown option - ' + text)
     sys.exit()
 
 confdir = os.getenv("my_config")

nmap_scan.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name		: nmap_scan.py
 # Author				: Craig Richards
 # Created				: 24th May 2013
@@ -16,7 +17,7 @@ def nmapScan(tgtHost, tgtPort):									# Create the function, this fucntion doe
   nmScan = nmap.PortScanner()
   nmScan.scan(tgtHost, tgtPort)
   state = nmScan[tgtHost]['tcp'][int(tgtPort)]['state']
-  print "[*] " + tgtHost + " tcp/" + tgtPort + " " + state
+  print("[*] " + tgtHost + " tcp/" + tgtPort + " " + state)
 
 
 def main():																								# Main Program
@@ -28,7 +29,7 @@ def main():																								# Main Program
   tgtPorts = str(options.tgtPort).split(',')
 
   if (tgtHost == None) | (tgtPorts[0] == None):
-    print parser.usage
+    print(parser.usage)
     exit(0)
 
   for tgtPort in tgtPorts:				# Scan the hosts with the ports etc

password_cracker.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name	: password_cracker.py
 # Author		: Craig Richards
 # Created		: 20 May 2013
@@ -18,7 +19,7 @@
     try:
        import fcrypt # Try importing the fcrypt module
     except ImportError:
-       print 'Please install fcrypt if you are on Windows'
+       print('Please install fcrypt if you are on Windows')
 
 
 def testPass(cryptPass):	  # Start the function
@@ -28,9 +29,9 @@ def testPass(cryptPass):	  # Start the function
     word = word.strip('\n')
     cryptWord = crypt.crypt(word, salt)	  # Check for password in the file
     if (cryptWord == cryptPass):
-      print "[+] Found Password: "+word+"\n"
+      print("[+] Found Password: "+word+"\n")
       return
-  print "[-] Password Not Found.\n"
+  print("[-] Password Not Found.\n")
   return
 
 
@@ -40,7 +41,7 @@ def main():
     if ":" in line:
       user = line.split(':')[0]
       cryptPass = line.split(':')[1].strip(' ') # Prepare the user name etc
-      print "[*] Cracking Password For: " + user
+      print("[*] Cracking Password For: " + user)
       testPass(cryptPass)				# Call it to crack the users password
 
 if __name__ == "__main__":

ping_servers.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name		: ping_servers.py
 # Author				: Craig Richards
 # Created				: 9th May 2012
@@ -14,14 +15,14 @@
 
 filename = sys.argv[0]																# Sets a variable for the script name
 if '-h' in sys.argv or '--h' in sys.argv or '-help' in sys.argv or '--help' in sys.argv:	# Help Menu if called
-    print '''
+    print('''
 You need to supply the application group for the servers you want to ping, i.e.
     dms
     swaps
 
 Followed by the site i.e.
     155
-    bromley'''
+    bromley''')
     sys.exit(0)
 else:
 

ping_subnet.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name		: ping_subnet.py
 # Author				: Craig Richards
 # Created				: 12th January 2012
@@ -15,8 +16,8 @@
 filename = sys.argv[0]																				# Sets a variable for the script name
 
 if '-h' in sys.argv or '--h' in sys.argv or '-help' in sys.argv or '--help' in sys.argv:	# Help Menu if called
-    print '''
-You need to supply the first octets of the address Usage : ''' + filename + ''' 111.111.111 '''
+    print('''
+You need to supply the first octets of the address Usage : ''' + filename + ''' 111.111.111 ''')
     sys.exit(0)
 else:
 

portscanner.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name	: portscanner.py
 # Author		: Craig Richards
 # Created		: 20 May 2013 
@@ -21,11 +22,11 @@ def connScan(tgtHost, tgtPort):		# Start of the function
 		connSkt.send('')
 		results=connSkt.recv(100)
 		screenLock.acquire()		# Acquire the lock
-		print '[+] %d/tcp open'% tgtPort
-		print '[+] ' + str(results)
+		print('[+] %d/tcp open'% tgtPort)
+		print('[+] ' + str(results))
 	except:
 		screenLock.acquire()
-		print '[-] %d/tcp closed '% tgtPort
+		print('[-] %d/tcp closed '% tgtPort)
 	finally:
 		screenLock.release()
 		connSkt.close()
@@ -34,13 +35,13 @@ def portScan(tgtHost, tgtPorts):	# Start of the function
 	try:
 		tgtIP = gethostbyname(tgtHost)	# Get the IP from the hostname
 	except:
-		print "[-] Cannot resolve '%s': Unknown host"%tgtHost
+		print("[-] Cannot resolve '%s': Unknown host"%tgtHost)
 		return
 	try:
 		tgtName = gethostbyaddr(tgtIP)	# Get hostname from IP
-		print '\n[+] Scan Results for: ' +tgtName[0]
+		print('\n[+] Scan Results for: ' +tgtName[0])
 	except:
-		print '\n[+] Scan Results for: ' + tgtIP
+		print('\n[+] Scan Results for: ' + tgtIP)
 	setdefaulttimeout(1)
 	for tgtPort in tgtPorts:	# Scan host and ports
 		t = Thread(target=connScan, args=(tgtHost, int(tgtPort)))
@@ -54,7 +55,7 @@ def main():
 	tgtHost = options.tgtHost
 	tgtPorts = str(options.tgtPort).split(',')
 	if (tgtHost == None) | (tgtPorts[0] == None):
-		print parser.usage
+		print(parser.usage)
 		exit(0)
 	portScan(tgtHost, tgtPorts)
 if __name__ == '__main__':

powerup_checks.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name		: powerup_checks.py
 # Author				: Craig Richards
 # Created				: 25th June 2013
@@ -63,27 +64,27 @@ def get_servers(query):																																# Function to get the ser
       break
     f = open(serverfile, 'a')																																# Open the serverfile
     f.write("%s\n" % str(row[0]))																													# Write the server out to the file
-    print row[0]																																			# Display the server to the screen
+    print(row[0])																																			# Display the server to the screen
     f.close()																																				# Close the file
 
 def main():																																					# Main Function
   if os.path.exists(serverfile):																														# Checks to see if there is an existing server file
     os.remove(serverfile)																																# If so remove it
 
   if len(sys.argv) < 2:																																	# Check there is an argument being passed
-    print text																																				# Display the help text if there isn't one passed
+    print(text)																																				# Display the help text if there isn't one passed
     sys.exit()																																				# Exit the script
 
   if '-h' in sys.argv or '--h' in sys.argv or '-help' in sys.argv or '--help' in sys.argv:													# If the ask for help
-    print text																																				# Display the help text if there isn't one passed
+    print(text)																																				# Display the help text if there isn't one passed
     sys.exit(0)																																				# Exit the script after displaying help
   else:
     if sys.argv[1].lower().startswith('-site1'):																										# If the argument is site1
       query = 'site1'																																		# Set the variable to have the value site
     elif sys.argv[1].lower().startswith('-site2'):																								# Else if the variable is bromley
       query = 'site2'																																	# Set the variable to have the value bromley
     else:
-      print '\n[-] Unknown option [-] ' + text																										# If an unknown option is passed, let the user know
+      print('\n[-] Unknown option [-] ' + text)																										# If an unknown option is passed, let the user know
       sys.exit(0)
   get_servers(query)																																	# Call the get servers funtion, with the value from the argument
 

pscheck.py

@@ -8,32 +8,35 @@
 
 # Description			: Process check on Nix boxes, diplsay formatted output from ps command
 
-import commands, os, string
+import commands
+import os
+import string
+
 
 def ps():
   program = raw_input("Enter the name of the program to check: ")
 
   try:
-    #perform a ps command and assign results to a list
+    # perform a ps command and assign results to a list
     output = commands.getoutput("ps -f|grep " + program)
     proginfo = string.split(output)
 
-    #display results
-    print "\n\
+    # display results
+    print("\n\
     Full path:\t\t", proginfo[5], "\n\
     Owner:\t\t\t", proginfo[0], "\n\
     Process ID:\t\t", proginfo[1], "\n\
     Parent process ID:\t", proginfo[2], "\n\
-    Time started:\t\t", proginfo[4]
+    Time started:\t\t", proginfo[4])
   except:
-    print ("There was a problem with the program.")
+    print("There was a problem with the program.")
 
 def main():
   if os.name == "posix":											# Unix/Linux/MacOS/BSD/etc
     ps()																	# Call the function
   elif os.name in ("nt", "dos", "ce"):							# if the OS is windows
-    print "You need to be on Linux or Unix to run this"
-		 
-		 
+    print("You need to be on Linux or Unix to run this")
+
+
 if __name__ == '__main__':
   main()

psunotify.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import mechanize
 import re
 import urllib2
@@ -19,7 +20,9 @@
     urls[int]=urls[int].replace("<b>","")
     urls[int]=urls[int].replace("</b>","")
     int=int+1
-print (urls)
+
+print(urls)
+
 for url in urls:
     try:
      temp=url.split("/")
@@ -31,7 +34,7 @@
      file=open('psu2'+q+'.pdf','wb')
      file.write(r.read())
      file.close()
-     print ("Done")
-    except urllib2.URLError as e:
-     print ("Sorry there exists a problem with this URL Please Download this Manually "+str(url))
 
+     print("Done")
+    except urllib2.URLError as e:
+     print("Sorry there exists a problem with this URL Please Download this Manually "+str(url))

python_sms.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 # Script Name	: python_sms.py
 # Author	: Craig Richards
 # Created	: 16th February 2017
@@ -63,14 +64,15 @@
   postdata = urllib.urlencode(values)
   req = urllib2.Request(url, postdata)
 
-  print ('Attempting to send SMS to '+ sname + ' at ' + snumber + ' on ' + tdate)
-  f.write ('Attempting to send SMS to '+ sname + ' at ' + snumber + ' on ' + tdate + '\n')
+  print('Attempting to send SMS to '+ sname + ' at ' + snumber + ' on ' + tdate)
+  f.write('Attempting to send SMS to '+ sname + ' at ' + snumber + ' on ' + tdate + '\n')
 
   try:
     response = urllib2.urlopen(req)
     response_url = response.geturl()
     if response_url == url:
-      print ('SMS sent!')
-  except urllib2.URLError, e:
-    print ('Send failed!')
-    print (e.reason)
+
+      print('SMS sent!')
+  except urllib2.URLError as e:
+    print('Send failed!')
+    print(e.reason)