diff --git a/Basic/Basicprob.py b/Basic/Basicprob.py deleted file mode 100644 index 397b66c..0000000 --- a/Basic/Basicprob.py +++ /dev/null @@ -1,216 +0,0 @@ -""" -# 1. Write a program to print all even numbers in given range in single line - -num = int(input('Enter number up-to you want even number: ')) -print("Even number between 0 to", num) -for i in range(0, num+1, 2): - print(i, ' ', end = '') -print('\nDone\n') -""" - -""" -# 2. Write a program to print all odd numbers in given range in single line - -num1 = int(input('Enter number up-to you want odd number: ')) -print('Odd number between 1 to', num1) -for i in range(1, num+1, 2): - print(i, ' ', end = '') -print('\nDone\n') -""" - -""" -# 3. Write a program to check that given number is positive or negative - -flag = True -while ( flag ): - n1 = int(input('Enter number which you want to check: ')) - if n1 > 0: - print(n1, 'is Positive') - elif n1 == 0: - print(n1, 'is neither positive nor negative') - else: - print(n1, 'is negative') - ch = input("Enter y/n : ") - if ch != 'y': - flag = False -print('Done\n') -""" - -""" -# 4. Write a program to reverse a number - -flag = True -while( flag ): - n2 = int(input('Enter a number which you want to reverse: ')) - rev = 0 - num = n2 - while (n2 > 0): - rem = n2 % 10 - rev = rev * 10 + rem - n2 = n2 // 10 - print('Reverse order of ', num, 'is', rev) - ch = input("Enter y/n: ") - if ch != 'y': - flag = False -print("Done\n") -""" - -""" -# 5. Write a program to calculate sum of the digits of a given number - -flag = True -while(flag): - n4 = int(input('Enter number: ')) - sum1 = 0 - num = n4 - while(n4 > 0): - rem = n4 % 10 - sum1 = sum1 + rem - n4 = n4 // 10 - print('Sum of digits of ', num, 'is', sum1) - ch = input("Enter y/n: ") - if ch != 'y': - flag = False -print('Done\n') -""" -""" -# 6. Write a program to calculate sum of first and last digit of a number -flag = True - -while(flag): - n1 = int(input('Enter number: ')) - num = n1 - while(n1>0): - rem = n1 % 10 - n1 = n1 // 10 - first_digit = rem - last_digit = num % 10 - last_first_digit_sum = first_digit + last_digit - print('Sum of first and last digit of ', num, 'is', last_first_digit_sum) - - ch = input("Enter y/n: ") - if ch != 'y': - flag = False -print('Done\n') -""" - -""" -# 7. Write a program to check that a given number is palindrome or not -flag = True - -while(flag): - n1 = int(input("Enter number: ")) - num = n1 - rev = 0 - while(n1>0): - rem = n1 % 10 - rev = rev*10 + rem - n1 = n1 //10 - if (num == rev): - print(num, 'is a palindrome number') - else: - print(num, 'is not a palindrome number') - ch = input('Enter y/n: ') - if ch != 'y': - flag = False -print('Done\n') -""" - -""" -# 8. Write a program to check a given number is prime or not -flag = True - -while flag: - n1 = int(input('Enter number: ')) - for i in range(2, n1+1): - if n1 % i == 0: - break - if n1 == i: - print(n1, 'is prime') - else: - print(n1, 'is not prime') - ch = input('Enter y/n: ') - if ch != 'y': - flag = False -print('Done \n') -""" - -""" -# 9. Write a program to check number is prime or not in given range - -n = int(input('Enter up-to which number you want prime number: ')) -print('Prime numbers between 2 to', n) -for num in range(2, n+1): - for i in range (2, num+1): - if num%i == 0: - break - if num == i: - print(num, end = ' ') -print('\nDone\n') -""" - -""" -# 10. Write a program to calculate the factorial of a number - -flag = True -while(flag): - n = int(input("Enter number for that factorial you want: ")) - fact = 1 - i = 1 - if n > 0: - while (i <= n): - fact *= i - i += 1 - print('factorial of', n, 'is', fact) - else: - print(n, ' is negative ') - - ch = input('Enter y/n: ') - if ch != 'y': - flag = False -print('Done\n') -""" - -""" -# 11. Write a program to calculate sum of first natural number - -flag = True -while(flag): - n = int(input('Enter number: ')) - sumn = n*(n+1)//2 - print('Sum of first',n, 'natural number is: ', sumn) - ch = input("Enter y/n: ") - if ch != 'y': - flag = False -print("Done \n") -""" - -""" -# 12. Write a program to calculate sum of all even integers in given range - -n = int(input("Enter number up-to you want add all even numbers: ")) -sum1 = 0 - -for i in range(0, n+1, 2): - sum1 += i - -print("Sum of all even numbers up-to ", n, 'is: ', sum1) -""" - -""" -# 13. Write a program to print table of number entered by user - -flag = True -while(flag): - n = int(input("Enter number which table you want to print: ")) - print('Table of', n) - for i in range(1, 11): - print(n, 'x', i, ' = ', n*i) - - ch = input('Enter y to print new table else n to exit: ') - if ch != 'y': - flag = False -print("\nDone\n") -""" - - diff --git a/Basic/demo1.py b/Basic/demo1.py deleted file mode 100644 index 622e960..0000000 --- a/Basic/demo1.py +++ /dev/null @@ -1,3 +0,0 @@ -# Writing first program in python - -print('Hello python ') \ No newline at end of file diff --git a/Basic/demo2.py b/Basic/demo2.py deleted file mode 100644 index d31db28..0000000 --- a/Basic/demo2.py +++ /dev/null @@ -1,8 +0,0 @@ -# printing a poem in python - -print( - 'Twinkle , twinkle little star \n' - 'how I wonder what you are\n' - 'up above the world so high \n' - 'like a diamond in the sky' - ) \ No newline at end of file diff --git a/Basic/demo3.py b/Basic/demo3.py deleted file mode 100644 index 4bfb009..0000000 --- a/Basic/demo3.py +++ /dev/null @@ -1,15 +0,0 @@ -# printing a triangle in python - -print(' /|') -print(' / |') -print(' / |') -print(' / |') -print(' /____|') - -# printing a Rectangle using print function - -print(' _____________') -print('| |') -print('| |') -print("| |") -print("|_____________|") diff --git a/Basic/demo4.py b/Basic/demo4.py deleted file mode 100644 index aff6091..0000000 --- a/Basic/demo4.py +++ /dev/null @@ -1,42 +0,0 @@ -""" -working with python data types and variables -Variable -> - Variable is like a container which store some value and for that value it occupies space in memory -""" - -# Integer Data Types -a = 9 -b = 10 -print("Value of a and b is: ", a, b) - -""" -check above data type belongs from which class -because whatever we create in python is an object -""" -print("Type of a and b is: ", type(a), type(b)) - -# Float Data Types -f1 = 20.34 -f2 = 40.56 -print('Values of f1 and f2 is: ', f1, f2) - -# Check above data types belongs from which class -print('Types of f1 and f2 is: ', type(f1), type(f2)) - -# Character or String Data Types -c1 = 'd' -s1 = 'abc' -print('Value of c1 and s1 is: ', c1, '', s1) - -# check above data types belongs from which class -print("Types of c1 and s1 is: ", type(c1), type(s1)) - -# Boolean Data Types -b1 = True -b2 = False -print("Values of b1 and b2 is: ", b1, ' ', b2) - -# check above data types belongs from which class -print("Types of b1 abd b2 is: ", type(b1), '', type(b2)) - - diff --git a/Basic/demo5.py b/Basic/demo5.py deleted file mode 100644 index 9ac0274..0000000 --- a/Basic/demo5.py +++ /dev/null @@ -1,106 +0,0 @@ -""" -working with python Operators -""" - -# Arithmetic Operator -# +, -, *, /, % -print('Arithmetic Operator') -a = 3; b= 5 -print("Sum of two numbers: ", a+b) -print("Subtraction of two numbers: ", a-b) -print('Multiplication of two numbers: ', a*b) -print("Division of two numbers: ", a/b) -print("Modulus of two numbers: ", b%a) -print('\n') - -# Assignment Operator -# +=, -=, *=, /= -print(" Assignment Operator") -v1 = 2; v2 = 5 -v1 += v2 -print("v1+=v2 = ", v1) - -v1 -= v2 -print('v1-=v2= ', v1) - -v1 *= v2 -print('v1*=v2= ', v1) - -v1 /= v2 -print("v1/=v2= ", v1) - -v1 %= v2 -print("v1%=v2= ", v1) -print('\n') - -# Relational Operator -# >=, <=, ==, !=, >, < -print("Relational Operator") -v3 = 1; v4 = 1 -print("Result of '==' operator: ", v3 == v4) -print("Result of '>=' operator: ", v3 >= v4) -print("Result of '<=' operator: ", v3 <= v4) -print("Result of '>' operator: ", v3 > v4) -print("Result of '<' operator: ", v3 < v4) -print("Result of '!=', operator: ", v3 != v4) -print('\n') - -# Logical Operator -# and, or , not -# syntax and -print("Logical Operator") -print('Using logical and: ',(2 > 3) and (3 > 2)) -print("Using logical or: ", (2 > 3) or (3 > 2)) -print("Using logical not: ", not(2 > 3)) -print("\n") - -# Bitwise Operator -# Bitwise &, Bitwise | -# Left Shift <<, Right Shift >> -# Bitwise XOR ^ -print("Bitwise Operator") -print("Using Bitwise & :", 4 & 5) -""" - 4 -> 1 0 0 - & & & - 5 -> 1 0 1 - ------- - 1 0 0 -> 4 -""" -print("Using Bitwise |: ", 4 | 5) -""" -4 -> 1 0 0 - | | | - 5 -> 1 0 1 - ------- - 1 0 1 -> 5 -""" -print("Left shift <<: ", 40 << 2) # 40*(2**2) -print("Right shift >>: ", 40 >> 3) # 40//(2**3) -print("XOR ^: ", 3 ^ 5) -""" - 3 -> 0 1 1 - ^ ^ ^ - 5 -> 1 0 1 - ------- - 1 1 0 -> 6 -""" - -print("\n") - - -# Ternary operator in python - -data = 10 if 10 > 0 else 0 - -print("data: ", data) - - - - - - - - - - diff --git a/Basic/demo6.py b/Basic/demo6.py deleted file mode 100644 index 1e5dcf3..0000000 --- a/Basic/demo6.py +++ /dev/null @@ -1,74 +0,0 @@ -""" - working with conditional statement in python -""" - -# There are three types of conditional statement in python -""" - if - if - else - if - elif - else -""" - -# if statement -""" - syntax - if (condition): - instruction - --- - --- - --- -boolean value of condition is true then inside instruction will execute otherwise not -""" - -a = 20 -if a == 20: - print('a is equal to 20\n') - - -# if - else statement -""" - syntax - - if(condition): - instruction - ----- - ----- - else: - instruction - ---- - ---- -boolean value of condition is true then inside instruction of if will execute otherwise else instruction will execute -""" -n = 50; n1 = 40 -if n < n1 : - print(n, 'is less than', n1) -else: - print(n, 'is greater than ', n1) -print('\n') - -# if-elif-else statement -""" - syntax - if(condition): - instruction - ----- - ----- - elif(condition1): - instruction - ----- - elif(condition2): - instruction - ------ - else: - instruction - ----- - ----- -""" -n2 = 10; n3 = 10 - -if n2 > n3: - print(n2, 'is greater than ', n3) -elif n2 == n3: - print(n2, 'is equal to', n3) -else: - print(n2, 'is less than', n3) \ No newline at end of file diff --git a/Basic/demo7.py b/Basic/demo7.py deleted file mode 100644 index 34eb999..0000000 --- a/Basic/demo7.py +++ /dev/null @@ -1,48 +0,0 @@ -""" - Control statements in python -""" - -# There are mainly two control statements in python -# for loop -# while loop - -# for loop -""" - syntax - for in range(n): - instruction - --- - --- -inside ths for loop instruction will execute until the value of n becomes (n-1) and it starts with default value '0' -range(start, end, steps) is built in function in python and default starting value is '0' and end value is (end-1) and -default step value is '1' -""" -print("Using for loop") -for i in range(5): - print(i,'-> Rupesh ') -print('\n') - -# while loop -""" - syntax - - initialize i = 0 - while(condition): - instruction - ----- - ----- - ----- - increment i by 1 or decrement i by 1 -the loop will execute until the condition becomes false - -""" -print("Using while loop") -i = 0 -while i < 5: - print(i, '-> Rupesh ') - i += 1 -print('\n') - - - - diff --git a/Basic/demo8.py b/Basic/demo8.py deleted file mode 100644 index 9b4df66..0000000 --- a/Basic/demo8.py +++ /dev/null @@ -1,18 +0,0 @@ -""" - How to take input by user and store it in some variable - we will use a built-in function - input(), this always returns a string and then we can type cast using int, float -""" - -name = input('Enter your name: ') -for i in range(len(name)): - print(i, '->', name[i]) - -# len(argument) is built-in function which returns length of given string - -num = int(input('Enter number: ')) -for i in range(num): - print(i) - - - diff --git a/BuiltInDataStructure/Dictionary/dict0_1.py b/BuiltInDataStructure/Dictionary/dict0_1.py deleted file mode 100644 index bc2ff41..0000000 --- a/BuiltInDataStructure/Dictionary/dict0_1.py +++ /dev/null @@ -1,36 +0,0 @@ -# Creating a dictionary -""" - 1. Method1 - - d = {key: value} - - 2. Method 2 - d = dict() -""" - -# using method 1 -d = { - 1: 'rupesh', - 2: 'ram', - 3: 'radhika', - 4: 'rohan' -} - -print(d) - -# Printing values taking reference of keys -print(d[1]) -print(d[2]) - -# Adding values to the dict -d[5] = 'radhika' -print(d) - -d1 = dict({1: 'ram', 'a': 5000}) -print(d1) - -print(d1['a']) - -d2 = dict() -d2['a'] = 4000 -print(d2) \ No newline at end of file diff --git a/BuiltInDataStructure/Dictionary/dict0_2.py b/BuiltInDataStructure/Dictionary/dict0_2.py deleted file mode 100644 index b397b06..0000000 --- a/BuiltInDataStructure/Dictionary/dict0_2.py +++ /dev/null @@ -1,22 +0,0 @@ -# Crating dictionary -d = dict() - -for i in range(6): - value = input("Enter value: ") - - d[i] = value - -print(d) - -print('Key value of the dictionary') -for key in d.keys(): - print(key, end = ' ') - -print('\nValues of the dictionary') -for value in d.values(): - print(value, end = " ") - -print('\n Key and values of the dictionary') -for (key, value) in d.items(): - print(key, '-->', value) - diff --git a/BuiltInDataStructure/Dictionary/dict0_3.py b/BuiltInDataStructure/Dictionary/dict0_3.py deleted file mode 100644 index ebdc790..0000000 --- a/BuiltInDataStructure/Dictionary/dict0_3.py +++ /dev/null @@ -1,21 +0,0 @@ -# Creating a dictionary -d = {} - -while True: - key = input("Enter key: ") - data = input("Enter data: ") - - d[key] = data - - ch = input("Enter y/n ") - if ch != 'y': - break - -print(d) - -for (k, data) in d.items(): - print(k, '-->', data) - print(d.get(k)) - -d.popitem() # deleting value from dictionary -print(d) \ No newline at end of file diff --git a/BuiltInDataStructure/Dictionary/dict0_4.py b/BuiltInDataStructure/Dictionary/dict0_4.py deleted file mode 100644 index 20ce570..0000000 --- a/BuiltInDataStructure/Dictionary/dict0_4.py +++ /dev/null @@ -1,45 +0,0 @@ -# performing some operation upon dictionary using some predefined method -dic = { - 'Name': 'Rupesh', - 'Age': 21, - 'Profession': 'Programmer', - 'Hobby': 'Playing Badminton', - 'Liked Food': 'Veg biryani' -} - -print("dictionary is ", dic) -for key in dic.keys(): - print(dic[key], end = " ") - -print() -dic.popitem() # Removes last key and values from the dictionary -print('dictionary is ', dic) - -dic.pop('Hobby') # removes values from a given key -print('dictionary is ', dic) - -# Invoking values from the dict using reference -for key in dic.keys(): - print(key, ': ', dic.get(key)) - -print() -# Without using get(k) method -for (k, data) in dic.items(): - print(k, ':', data) - -print() -print(dic.fromkeys([1, 2, 3, 4], {'a': 'Ram'})) -print() -print(dic) - -print() -dict1 = dic.copy() # copying a dictionary to another -print(dict1) - -dict2 = dict1 # copying a dictionary to another -print('\ndict2', dict2) - -# cleaning entire dict2 -dict2.clear() -print('\ndict2', dict2) - diff --git a/BuiltInDataStructure/Dictionary/dict0_5.py b/BuiltInDataStructure/Dictionary/dict0_5.py deleted file mode 100644 index 3f3cc8b..0000000 --- a/BuiltInDataStructure/Dictionary/dict0_5.py +++ /dev/null @@ -1,34 +0,0 @@ -# Creating a dictionary of lists -d = { - 'list1': [n for n in range(0, 20)], - 'list2': [n for n in range(1, 20)], - 'list3': [2*i for i in range(1, 11)] -} - -print("key Values") -for (k, ls) in d.items(): - print(k, "-> ", ls) - print() - - -# Creating a dictionary of dictionary means nested dictionary -dic = { - 'd1': { - 1: 10, - 2: 20, - 3: 30 - }, - - 'd2': { - 'a': 'vowel', - 'e': 'vowel', - 'i': 'vowel', - 'o': 'vowel', - 'u': 'vowel' - }, - - 'list1': [n*6 for n in range(1, 11)] -} - -for (key, data) in dic.items(): - print(key, '->', data) diff --git a/BuiltInDataStructure/List/ls0_1.py b/BuiltInDataStructure/List/ls0_1.py deleted file mode 100644 index 7ed19b4..0000000 --- a/BuiltInDataStructure/List/ls0_1.py +++ /dev/null @@ -1,40 +0,0 @@ -# A list is a built - in data structure in python which contains dissimilar data type -# declaring a list in python -""" - 1. Method 1 - ls = [1, 2,3,4 'a', 3.45, True, False, 'rupesh'] - // Accessing element ls[0], ls[1], ls[2] - - 2. Method 2 - ls = list() - - 3. Method 3 - ls = input().split() #split() is predefined method which creates a list of char - -""" -# Defining a list using first method -ls = [1, 2, 3, 4, 5, 6, 7, 8] -print("list ", ls) - -# printing every element of the list -for i in range(len(ls)): - print(ls[i], end = ' ') - -# Defining a list using second method -print() -l = list() -print("list ", l) - -n = input() -l.append(n) # append(argument) is predefined method to add element in the list at the end of the list -print('list after adding data ', l) - -# Creating a list without using above defined method -l1 = input().split() # split() is predefined method which splits a string and gives output as list - -print("list ", l1) - -sm = 0 -for d in l1: - sm += int(d) -print("Sum of values in list l1 = ", sm) \ No newline at end of file diff --git a/BuiltInDataStructure/List/ls0_2.py b/BuiltInDataStructure/List/ls0_2.py deleted file mode 100644 index 95c95f8..0000000 --- a/BuiltInDataStructure/List/ls0_2.py +++ /dev/null @@ -1,59 +0,0 @@ -# performing some operation upon the list using predefined method to handle the list -ls = list() # Creating an empty list - -print(ls) -# adding element in the list using append(argument) -ls.append(20) -ls.append(30) - -print(ls) -# inserting data at particular position manually -ls[0] = 34 - -print(ls) - -# inserting data at particular position using insert(pos, data) function -ls.insert(0, 50) -ls.insert(-1, 40) -print(ls) - -# reverse list using reverse() method -ls.reverse() -print(ls) - -# sorting list element using sort() method -ls.sort() -print(ls) - -# find index of the data in the list using index(data, start, end) -print('Index of '+str(30)+' is ', ls.index(30, 0, len(ls))) - -# counting a particular element in the given list count(data) -print(str(30)+" is in list ", end = ' ') -print(ls.count(30), 'times') - -# copying a list using copy() -ls1 = ls.copy() -print('After copying ls data in ls1 ', ls1) - -# deleting value from a specific index from the list using pop(index) method -val = ls1.pop(len(ls1)-1) -print("Deleting a value from the ls1 ", val) - -print("ls1 after deleting a value ", ls1) - -# deleting specific value of the list using remove(value) method -ls1.remove(30) - -print('ls1 after deleting 30 ', ls1) -# clearing all values from the list using clear() method -ls1.clear() - -print('ls1 after clearing all data ', ls1) - -# extending a ls1 using extend(list) method -ls1.extend(ls) -ls1[0] = 45 -print('After extending the ls1', ls1) - - diff --git a/BuiltInDataStructure/List/ls0_3.py b/BuiltInDataStructure/List/ls0_3.py deleted file mode 100644 index e48ef6d..0000000 --- a/BuiltInDataStructure/List/ls0_3.py +++ /dev/null @@ -1,24 +0,0 @@ -# getting values from the list using iteration - -ls = [] - -flag = True -while flag: - num = int(input("Enter number: ")) - ls.append(num) - - ch = input("Enter y to enter more data in the list otherwise n") - if ch != 'y': - flag = False - -print('list is ', ls) - -# List element using index value -print("\nGetting values from the list using index") -for i in range(len(ls)): - print(ls[i], end = ' ') - -print("\nGetting values from the list without using index") -# list element -for x in ls: - print(x, end = ' ') \ No newline at end of file diff --git a/BuiltInDataStructure/List/ls0_4.py b/BuiltInDataStructure/List/ls0_4.py deleted file mode 100644 index 9449c33..0000000 --- a/BuiltInDataStructure/List/ls0_4.py +++ /dev/null @@ -1,13 +0,0 @@ -# Creating a list of string and then calculating sum of the list elements - -ls = input("Enter number: ").split(' ') # using this we can create a list taking input in one - -print('list is ', ls) -sm = 0 -for x in ls: - sm += int(x) -print('Sum of above list is= ', sm) - -# creating and initializing values to the list -ls1 = list([2, 3, 4, 5, 5]) -print(ls1) \ No newline at end of file diff --git a/BuiltInDataStructure/List/ls0_5.py b/BuiltInDataStructure/List/ls0_5.py deleted file mode 100644 index fb60fb2..0000000 --- a/BuiltInDataStructure/List/ls0_5.py +++ /dev/null @@ -1,21 +0,0 @@ -# list comprehension - -ls = [i for i in range(10)] # creating a list using list comprehension - -print(ls) - -ls1 = [n for n in range(20) if n%2 == 0] -print(ls1) - -ls2 = [[a, b] for a in range(10) for b in range(10) if (a+b) != 2] -print(ls2) - -ls3 = [{a: b} for a in range(10) for b in range(2, 12)] # Creating a list of dictionaries -print(ls3) - -matrix = [[a, b, c] for a in range(2) for b in range(a+1) for c in range(b+1)] - -for row in matrix: - for data in row: - print(data, end = " ") - print() diff --git a/BuiltInDataStructure/Tuple/tuple0_1.py b/BuiltInDataStructure/Tuple/tuple0_1.py deleted file mode 100644 index e55c25c..0000000 --- a/BuiltInDataStructure/Tuple/tuple0_1.py +++ /dev/null @@ -1,36 +0,0 @@ -# Creating a tuple -# Tuple is an ordered immutable built-in data structure -""" - 1. Method 1 - t = (1, 2, 3, 4, 5, 6) - - 2. Method 2 - t = tuple((2, 3, 4,4)) -""" - -# Creating tuple using method 1 -t = (1, 2, 3, 4, 5, 6, 7) -print(t) -print(type(t)) - -# t[0] = 45 tuples are immutable due to that it will throw an error - -# Creating tuple using method 2 -t1 = tuple((10, 20, 30)) -print(t1) - -# Creating tuple of one element -t2 = (30, ) # Notice here t2 = (30) is not a tuple declaration -print(t2) - -# Iterating tuple and getting value using index -for i in range(len(t)): - print(t[i], end = " ") - -print() -for d in t: - print(d, end= ' ') - - - - diff --git a/BuiltInDataStructure/Tuple/tuple0_2.py b/BuiltInDataStructure/Tuple/tuple0_2.py deleted file mode 100644 index ce6dd27..0000000 --- a/BuiltInDataStructure/Tuple/tuple0_2.py +++ /dev/null @@ -1,19 +0,0 @@ -# Updating a tuple -""" - We know that tuples are immutable we can not modify tuple directly. - But there is an alternate method to modify the tuple. - First we will convert it into list and we wll make modification in the list - and then again we will convert that list into tuple -""" - -t = (10, 20, 30, 40, 50, 60) -print('Before modification tuple is') -print(t) - -# We have to insert data at the 2th position -ls = list(t) -ls[1] = 12 -t = tuple(ls) - -print("After modification tuple is") -print(t) diff --git a/Files/demo.txt b/Files/demo.txt deleted file mode 100644 index 6f5c72d..0000000 --- a/Files/demo.txt +++ /dev/null @@ -1,10 +0,0 @@ - -Hello I am performing file handling in python. - -We can use the file handle as the sequence in our for loop. Our for loop simply - -counts the number of lines in the file and prints them out. The rough translation - -of the for loop into English is, for each line in the file represented by the file - -handle, add one to the count variable. \ No newline at end of file diff --git a/Files/demo1.txt b/Files/demo1.txt deleted file mode 100644 index 4aa3bc6..0000000 --- a/Files/demo1.txt +++ /dev/null @@ -1,7 +0,0 @@ -From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008 -Return-Path: -Date: Sat, 5 Jan 2008 09:12:18 -0500 -To: source@collab.sakaiproject.org -From: stephen.marquard@uct.ac.za -Subject: [sakai] svn commit: r39772 - content/branches/ -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39772 \ No newline at end of file diff --git a/Files/demo2.docx b/Files/demo2.docx deleted file mode 100644 index 08e5cbf..0000000 Binary files a/Files/demo2.docx and /dev/null differ diff --git a/Files/demo3.pdf b/Files/demo3.pdf deleted file mode 100644 index f506609..0000000 Binary files a/Files/demo3.pdf and /dev/null differ diff --git a/Files/demo4.txt b/Files/demo4.txt deleted file mode 100644 index 67d838f..0000000 --- a/Files/demo4.txt +++ /dev/null @@ -1,3 +0,0 @@ -Hello, How are you -My name is Rupesh Kumar Dwivedi -I am pursuing my B.Tech From GU diff --git a/Files/demo5.txt b/Files/demo5.txt deleted file mode 100644 index 35bad6a..0000000 --- a/Files/demo5.txt +++ /dev/null @@ -1,1909 +0,0 @@ -From stephen.marquard@uct.ac.za Sat Jan 5 09:14:16 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.90]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Sat, 05 Jan 2008 09:14:16 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Sat, 05 Jan 2008 09:14:16 -0500 -Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79]) - by flawless.mail.umich.edu () with ESMTP id m05EEFR1013674; - Sat, 5 Jan 2008 09:14:15 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY holes.mr.itd.umich.edu ID 477F90B0.2DB2F.12494 ; - 5 Jan 2008 09:14:10 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 5F919BC2F2; - Sat, 5 Jan 2008 14:10:05 +0000 (GMT) -Message-ID: <200801051412.m05ECIaH010327@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 899 - for ; - Sat, 5 Jan 2008 14:09:50 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id A215243002 - for ; Sat, 5 Jan 2008 14:13:33 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m05ECJVp010329 - for ; Sat, 5 Jan 2008 09:12:19 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m05ECIaH010327 - for source@collab.sakaiproject.org; Sat, 5 Jan 2008 09:12:18 -0500 -Date: Sat, 5 Jan 2008 09:12:18 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: stephen.marquard@uct.ac.za -Subject: [sakai] svn commit: r39772 - content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Sat Jan 5 09:14:16 2008 -X-DSPAM-Confidence: 0.8475 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39772 - -Author: stephen.marquard@uct.ac.za -Date: 2008-01-05 09:12:07 -0500 (Sat, 05 Jan 2008) -New Revision: 39772 - -Modified: -content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/ContentServiceSqlOracle.java -content/branches/sakai_2-5-x/content-impl/impl/src/java/org/sakaiproject/content/impl/DbContentService.java -Log: -SAK-12501 merge to 2-5-x: r39622, r39624:5, r39632:3 (resolve conflict from differing linebreaks for r39622) - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From louis@media.berkeley.edu Fri Jan 4 18:10:48 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.97]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 18:10:48 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 18:10:48 -0500 -Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149]) - by sleepers.mail.umich.edu () with ESMTP id m04NAbGa029441; - Fri, 4 Jan 2008 18:10:37 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY icestorm.mr.itd.umich.edu ID 477EBCE3.161BB.4320 ; - 4 Jan 2008 18:10:31 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 07969BB706; - Fri, 4 Jan 2008 23:10:33 +0000 (GMT) -Message-ID: <200801042308.m04N8v6O008125@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 710 - for ; - Fri, 4 Jan 2008 23:10:10 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 4BA2F42F57 - for ; Fri, 4 Jan 2008 23:10:10 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04N8vHG008127 - for ; Fri, 4 Jan 2008 18:08:57 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04N8v6O008125 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 18:08:57 -0500 -Date: Fri, 4 Jan 2008 18:08:57 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f -To: source@collab.sakaiproject.org -From: louis@media.berkeley.edu -Subject: [sakai] svn commit: r39771 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle java/org/sakaiproject/site/tool -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 18:10:48 2008 -X-DSPAM-Confidence: 0.6178 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39771 - -Author: louis@media.berkeley.edu -Date: 2008-01-04 18:08:50 -0500 (Fri, 04 Jan 2008) -New Revision: 39771 - -Modified: -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java -Log: -BSP-1415 New (Guest) user Notification - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From zqian@umich.edu Fri Jan 4 16:10:39 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.25]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 16:10:39 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 16:10:39 -0500 -Received: from ghostbusters.mr.itd.umich.edu (ghostbusters.mr.itd.umich.edu [141.211.93.144]) - by panther.mail.umich.edu () with ESMTP id m04LAcZw014275; - Fri, 4 Jan 2008 16:10:38 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY ghostbusters.mr.itd.umich.edu ID 477EA0C6.A0214.25480 ; - 4 Jan 2008 16:10:33 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id C48CDBB490; - Fri, 4 Jan 2008 21:10:31 +0000 (GMT) -Message-ID: <200801042109.m04L92hb007923@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 906 - for ; - Fri, 4 Jan 2008 21:10:18 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 7D13042F71 - for ; Fri, 4 Jan 2008 21:10:14 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04L927E007925 - for ; Fri, 4 Jan 2008 16:09:02 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04L92hb007923 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 16:09:02 -0500 -Date: Fri, 4 Jan 2008 16:09:02 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f -To: source@collab.sakaiproject.org -From: zqian@umich.edu -Subject: [sakai] svn commit: r39770 - site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 16:10:39 2008 -X-DSPAM-Confidence: 0.6961 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39770 - -Author: zqian@umich.edu -Date: 2008-01-04 16:09:01 -0500 (Fri, 04 Jan 2008) -New Revision: 39770 - -Modified: -site-manage/branches/sakai_2-5-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm -Log: -merge fix to SAK-9996 into 2-5-x branch: svn merge -r 39687:39688 https://source.sakaiproject.org/svn/site-manage/trunk/ - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From rjlowe@iupui.edu Fri Jan 4 15:46:24 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.25]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 15:46:24 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 15:46:24 -0500 -Received: from dreamcatcher.mr.itd.umich.edu (dreamcatcher.mr.itd.umich.edu [141.211.14.43]) - by panther.mail.umich.edu () with ESMTP id m04KkNbx032077; - Fri, 4 Jan 2008 15:46:23 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY dreamcatcher.mr.itd.umich.edu ID 477E9B13.2F3BC.22965 ; - 4 Jan 2008 15:46:13 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 4AE03BB552; - Fri, 4 Jan 2008 20:46:13 +0000 (GMT) -Message-ID: <200801042044.m04Kiem3007881@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 38 - for ; - Fri, 4 Jan 2008 20:45:56 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id A55D242F57 - for ; Fri, 4 Jan 2008 20:45:52 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04KieqE007883 - for ; Fri, 4 Jan 2008 15:44:40 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Kiem3007881 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:44:40 -0500 -Date: Fri, 4 Jan 2008 15:44:40 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f -To: source@collab.sakaiproject.org -From: rjlowe@iupui.edu -Subject: [sakai] svn commit: r39769 - in gradebook/trunk/app/ui/src: java/org/sakaiproject/tool/gradebook/ui/helpers/beans java/org/sakaiproject/tool/gradebook/ui/helpers/producers webapp/WEB-INF webapp/WEB-INF/bundle -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 15:46:24 2008 -X-DSPAM-Confidence: 0.7565 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39769 - -Author: rjlowe@iupui.edu -Date: 2008-01-04 15:44:39 -0500 (Fri, 04 Jan 2008) -New Revision: 39769 - -Modified: -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java -gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml -gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties -gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml -Log: -SAK-12180 - Fixed errors with grading helper - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From zqian@umich.edu Fri Jan 4 15:03:18 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.46]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 15:03:18 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 15:03:18 -0500 -Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83]) - by fan.mail.umich.edu () with ESMTP id m04K3HGF006563; - Fri, 4 Jan 2008 15:03:17 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY firestarter.mr.itd.umich.edu ID 477E9100.8F7F4.1590 ; - 4 Jan 2008 15:03:15 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 57770BB477; - Fri, 4 Jan 2008 20:03:09 +0000 (GMT) -Message-ID: <200801042001.m04K1cO0007738@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 622 - for ; - Fri, 4 Jan 2008 20:02:46 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id AB4D042F4D - for ; Fri, 4 Jan 2008 20:02:50 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04K1cXv007740 - for ; Fri, 4 Jan 2008 15:01:38 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04K1cO0007738 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 15:01:38 -0500 -Date: Fri, 4 Jan 2008 15:01:38 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f -To: source@collab.sakaiproject.org -From: zqian@umich.edu -Subject: [sakai] svn commit: r39766 - site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 15:03:18 2008 -X-DSPAM-Confidence: 0.7626 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39766 - -Author: zqian@umich.edu -Date: 2008-01-04 15:01:37 -0500 (Fri, 04 Jan 2008) -New Revision: 39766 - -Modified: -site-manage/branches/sakai_2-4-x/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java -Log: -merge fix to SAK-10788 into site-manage 2.4.x branch: - -Sakai Source Repository #38024 Wed Nov 07 14:54:46 MST 2007 zqian@umich.edu Fix to SAK-10788: If a provided id in a couse site is fake or doesn't provide any user information, Site Info appears to be like project site with empty participant list - -Watch for enrollments object being null and concatenate provider ids when there are more than one. -Files Changed -MODIFY /site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java - - - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From rjlowe@iupui.edu Fri Jan 4 14:50:18 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.93]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 14:50:18 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 14:50:18 -0500 -Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142]) - by mission.mail.umich.edu () with ESMTP id m04JoHJi019755; - Fri, 4 Jan 2008 14:50:17 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY eyewitness.mr.itd.umich.edu ID 477E8DF2.67B91.5278 ; - 4 Jan 2008 14:50:13 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 2D1B9BB492; - Fri, 4 Jan 2008 19:47:10 +0000 (GMT) -Message-ID: <200801041948.m04JmdwO007705@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 960 - for ; - Fri, 4 Jan 2008 19:46:50 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id B3E6742F4A - for ; Fri, 4 Jan 2008 19:49:51 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04JmeV9007707 - for ; Fri, 4 Jan 2008 14:48:40 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04JmdwO007705 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 14:48:39 -0500 -Date: Fri, 4 Jan 2008 14:48:39 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to rjlowe@iupui.edu using -f -To: source@collab.sakaiproject.org -From: rjlowe@iupui.edu -Subject: [sakai] svn commit: r39765 - in gradebook/trunk/app: business/src/java/org/sakaiproject/tool/gradebook/business business/src/java/org/sakaiproject/tool/gradebook/business/impl ui ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers ui/src/webapp/WEB-INF ui/src/webapp/WEB-INF/bundle ui/src/webapp/content/templates -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 14:50:18 2008 -X-DSPAM-Confidence: 0.7556 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39765 - -Author: rjlowe@iupui.edu -Date: 2008-01-04 14:48:37 -0500 (Fri, 04 Jan 2008) -New Revision: 39765 - -Added: -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordBean.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/AssignmentGradeRecordCreator.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryGradeEntityProvider.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/params/GradeGradebookItemViewParams.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/GradeGradebookItemProducer.java -gradebook/trunk/app/ui/src/webapp/content/templates/grade-gradebook-item.html -Modified: -gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/GradebookManager.java -gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java -gradebook/trunk/app/ui/pom.xml -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/beans/GradebookItemBean.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntryEntityProvider.java -gradebook/trunk/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/producers/AddGradebookItemProducer.java -gradebook/trunk/app/ui/src/webapp/WEB-INF/applicationContext.xml -gradebook/trunk/app/ui/src/webapp/WEB-INF/bundle/messages.properties -gradebook/trunk/app/ui/src/webapp/WEB-INF/requestContext.xml -Log: -SAK-12180 - New helper tool to grade an assignment - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From cwen@iupui.edu Fri Jan 4 11:37:30 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.46]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:37:30 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:37:30 -0500 -Received: from tadpole.mr.itd.umich.edu (tadpole.mr.itd.umich.edu [141.211.14.72]) - by fan.mail.umich.edu () with ESMTP id m04GbT9x022078; - Fri, 4 Jan 2008 11:37:29 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY tadpole.mr.itd.umich.edu ID 477E60B2.82756.9904 ; - 4 Jan 2008 11:37:09 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 8D13DBB001; - Fri, 4 Jan 2008 16:37:07 +0000 (GMT) -Message-ID: <200801041635.m04GZQGZ007313@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 120 - for ; - Fri, 4 Jan 2008 16:36:40 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id D430B42E42 - for ; Fri, 4 Jan 2008 16:36:37 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GZQ7W007315 - for ; Fri, 4 Jan 2008 11:35:26 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GZQGZ007313 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:35:26 -0500 -Date: Fri, 4 Jan 2008 11:35:26 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f -To: source@collab.sakaiproject.org -From: cwen@iupui.edu -Subject: [sakai] svn commit: r39764 - in msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums: . ui -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:37:30 2008 -X-DSPAM-Confidence: 0.7002 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39764 - -Author: cwen@iupui.edu -Date: 2008-01-04 11:35:25 -0500 (Fri, 04 Jan 2008) -New Revision: 39764 - -Modified: -msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java -msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java -Log: -unmerge Xingtang's checkin for SAK-12488. - -svn merge -r39558:39557 https://source.sakaiproject.org/svn/msgcntr/trunk -U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java -U messageforums-app/src/java/org/sakaiproject/tool/messageforums/ui/PrivateMessageDecoratedBean.java - -svn log -r 39558 ------------------------------------------------------------------------- -r39558 | hu2@iupui.edu | 2007-12-20 15:25:38 -0500 (Thu, 20 Dec 2007) | 3 lines - -SAK-12488 -when send a message to yourself. click reply to all, cc row should be null. -http://jira.sakaiproject.org/jira/browse/SAK-12488 ------------------------------------------------------------------------- - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From cwen@iupui.edu Fri Jan 4 11:35:08 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.46]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:35:08 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:35:08 -0500 -Received: from it.mr.itd.umich.edu (it.mr.itd.umich.edu [141.211.93.151]) - by fan.mail.umich.edu () with ESMTP id m04GZ6lt020480; - Fri, 4 Jan 2008 11:35:06 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY it.mr.itd.umich.edu ID 477E6033.6469D.21870 ; - 4 Jan 2008 11:35:02 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id E40FABAE5B; - Fri, 4 Jan 2008 16:34:38 +0000 (GMT) -Message-ID: <200801041633.m04GX6eG007292@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 697 - for ; - Fri, 4 Jan 2008 16:34:01 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CD0C42E42 - for ; Fri, 4 Jan 2008 16:34:17 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GX6Y3007294 - for ; Fri, 4 Jan 2008 11:33:06 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GX6eG007292 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:33:06 -0500 -Date: Fri, 4 Jan 2008 11:33:06 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f -To: source@collab.sakaiproject.org -From: cwen@iupui.edu -Subject: [sakai] svn commit: r39763 - in msgcntr/trunk: messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle messageforums-app/src/java/org/sakaiproject/tool/messageforums -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:35:08 2008 -X-DSPAM-Confidence: 0.7615 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39763 - -Author: cwen@iupui.edu -Date: 2008-01-04 11:33:05 -0500 (Fri, 04 Jan 2008) -New Revision: 39763 - -Modified: -msgcntr/trunk/messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties -msgcntr/trunk/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java -Log: -unmerge Xingtang's check in for SAK-12484. - -svn merge -r39571:39570 https://source.sakaiproject.org/svn/msgcntr/trunk -U messageforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties -U messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java - -svn log -r 39571 ------------------------------------------------------------------------- -r39571 | hu2@iupui.edu | 2007-12-20 21:26:28 -0500 (Thu, 20 Dec 2007) | 3 lines - -SAK-12484 -reply all cc list should not include the current user name. -http://jira.sakaiproject.org/jira/browse/SAK-12484 ------------------------------------------------------------------------- - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From gsilver@umich.edu Fri Jan 4 11:12:37 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.25]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:12:37 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:12:37 -0500 -Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79]) - by panther.mail.umich.edu () with ESMTP id m04GCaHB030887; - Fri, 4 Jan 2008 11:12:36 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY holes.mr.itd.umich.edu ID 477E5AEB.E670B.28397 ; - 4 Jan 2008 11:12:30 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 99715BAE7D; - Fri, 4 Jan 2008 16:12:27 +0000 (GMT) -Message-ID: <200801041611.m04GB1Lb007221@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 272 - for ; - Fri, 4 Jan 2008 16:12:14 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 0A6ED42DFC - for ; Fri, 4 Jan 2008 16:12:12 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GB1Wt007223 - for ; Fri, 4 Jan 2008 11:11:01 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GB1Lb007221 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:11:01 -0500 -Date: Fri, 4 Jan 2008 11:11:01 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f -To: source@collab.sakaiproject.org -From: gsilver@umich.edu -Subject: [sakai] svn commit: r39762 - web/trunk/web-tool/tool/src/bundle -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:12:37 2008 -X-DSPAM-Confidence: 0.7601 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39762 - -Author: gsilver@umich.edu -Date: 2008-01-04 11:11:00 -0500 (Fri, 04 Jan 2008) -New Revision: 39762 - -Modified: -web/trunk/web-tool/tool/src/bundle/iframe.properties -Log: -SAK-12596 -http://bugs.sakaiproject.org/jira/browse/SAK-12596 -- left moot (unused) entries commented for now - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From gsilver@umich.edu Fri Jan 4 11:11:52 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.36]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:11:52 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:11:52 -0500 -Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84]) - by godsend.mail.umich.edu () with ESMTP id m04GBqqv025330; - Fri, 4 Jan 2008 11:11:52 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY creepshow.mr.itd.umich.edu ID 477E5AB3.5CC32.30840 ; - 4 Jan 2008 11:11:34 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 62AA4BAE46; - Fri, 4 Jan 2008 16:11:31 +0000 (GMT) -Message-ID: <200801041610.m04GA5KP007209@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 1006 - for ; - Fri, 4 Jan 2008 16:11:18 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id C596A3DFA2 - for ; Fri, 4 Jan 2008 16:11:16 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04GA5LR007211 - for ; Fri, 4 Jan 2008 11:10:05 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04GA5KP007209 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:10:05 -0500 -Date: Fri, 4 Jan 2008 11:10:05 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f -To: source@collab.sakaiproject.org -From: gsilver@umich.edu -Subject: [sakai] svn commit: r39761 - site/trunk/site-tool/tool/src/bundle -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:11:52 2008 -X-DSPAM-Confidence: 0.7605 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39761 - -Author: gsilver@umich.edu -Date: 2008-01-04 11:10:04 -0500 (Fri, 04 Jan 2008) -New Revision: 39761 - -Modified: -site/trunk/site-tool/tool/src/bundle/admin.properties -Log: -SAK-12595 -http://bugs.sakaiproject.org/jira/browse/SAK-12595 -- left moot (unused) entries commented for now - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From zqian@umich.edu Fri Jan 4 11:11:03 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.97]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:11:03 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:11:03 -0500 -Received: from carrie.mr.itd.umich.edu (carrie.mr.itd.umich.edu [141.211.93.152]) - by sleepers.mail.umich.edu () with ESMTP id m04GB3Vg011502; - Fri, 4 Jan 2008 11:11:03 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY carrie.mr.itd.umich.edu ID 477E5A8D.B378F.24200 ; - 4 Jan 2008 11:10:56 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id C7251BAD44; - Fri, 4 Jan 2008 16:10:53 +0000 (GMT) -Message-ID: <200801041609.m04G9EuX007197@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 483 - for ; - Fri, 4 Jan 2008 16:10:27 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 2E7043DFA2 - for ; Fri, 4 Jan 2008 16:10:26 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G9Eqg007199 - for ; Fri, 4 Jan 2008 11:09:15 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G9EuX007197 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:09:14 -0500 -Date: Fri, 4 Jan 2008 11:09:14 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f -To: source@collab.sakaiproject.org -From: zqian@umich.edu -Subject: [sakai] svn commit: r39760 - in site-manage/trunk/site-manage-tool/tool/src: java/org/sakaiproject/site/tool webapp/vm/sitesetup -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:11:03 2008 -X-DSPAM-Confidence: 0.6959 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39760 - -Author: zqian@umich.edu -Date: 2008-01-04 11:09:12 -0500 (Fri, 04 Jan 2008) -New Revision: 39760 - -Modified: -site-manage/trunk/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java -site-manage/trunk/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-list.vm -Log: -fix to SAK-10911: Refactor use of site.upd, site.upd.site.mbrship and site.upd.grp.mbrship permissions - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From gsilver@umich.edu Fri Jan 4 11:10:22 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.39]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 11:10:22 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 11:10:22 -0500 -Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79]) - by faithful.mail.umich.edu () with ESMTP id m04GAL9k010604; - Fri, 4 Jan 2008 11:10:21 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY holes.mr.itd.umich.edu ID 477E5A67.34350.23015 ; - 4 Jan 2008 11:10:18 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 98D04BAD43; - Fri, 4 Jan 2008 16:10:11 +0000 (GMT) -Message-ID: <200801041608.m04G8d7w007184@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 966 - for ; - Fri, 4 Jan 2008 16:09:51 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 9F89542DD0 - for ; Fri, 4 Jan 2008 16:09:50 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04G8dXN007186 - for ; Fri, 4 Jan 2008 11:08:39 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04G8d7w007184 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 11:08:39 -0500 -Date: Fri, 4 Jan 2008 11:08:39 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gsilver@umich.edu using -f -To: source@collab.sakaiproject.org -From: gsilver@umich.edu -Subject: [sakai] svn commit: r39759 - mailarchive/trunk/mailarchive-tool/tool/src/bundle -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 11:10:22 2008 -X-DSPAM-Confidence: 0.7606 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39759 - -Author: gsilver@umich.edu -Date: 2008-01-04 11:08:38 -0500 (Fri, 04 Jan 2008) -New Revision: 39759 - -Modified: -mailarchive/trunk/mailarchive-tool/tool/src/bundle/email.properties -Log: -SAK-12592 -http://bugs.sakaiproject.org/jira/browse/SAK-12592 -- left moot (unused) entries commented for now - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From wagnermr@iupui.edu Fri Jan 4 10:38:42 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.90]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 10:38:42 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 10:38:42 -0500 -Received: from shining.mr.itd.umich.edu (shining.mr.itd.umich.edu [141.211.93.153]) - by flawless.mail.umich.edu () with ESMTP id m04Fcfjm012313; - Fri, 4 Jan 2008 10:38:41 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY shining.mr.itd.umich.edu ID 477E52FA.E6C6E.24093 ; - 4 Jan 2008 10:38:37 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 6A39594CD2; - Fri, 4 Jan 2008 15:37:36 +0000 (GMT) -Message-ID: <200801041537.m04Fb6Ci007092@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 690 - for ; - Fri, 4 Jan 2008 15:37:21 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id CEFA037ACE - for ; Fri, 4 Jan 2008 15:38:17 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04Fb6nh007094 - for ; Fri, 4 Jan 2008 10:37:06 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04Fb6Ci007092 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:37:06 -0500 -Date: Fri, 4 Jan 2008 10:37:06 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to wagnermr@iupui.edu using -f -To: source@collab.sakaiproject.org -From: wagnermr@iupui.edu -Subject: [sakai] svn commit: r39758 - in gradebook/trunk: app/business/src/java/org/sakaiproject/tool/gradebook/business/impl service/api/src/java/org/sakaiproject/service/gradebook/shared service/impl/src/java/org/sakaiproject/component/gradebook -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 10:38:42 2008 -X-DSPAM-Confidence: 0.7559 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39758 - -Author: wagnermr@iupui.edu -Date: 2008-01-04 10:37:04 -0500 (Fri, 04 Jan 2008) -New Revision: 39758 - -Modified: -gradebook/trunk/app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java -gradebook/trunk/service/api/src/java/org/sakaiproject/service/gradebook/shared/GradebookService.java -gradebook/trunk/service/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java -Log: -SAK-12175 -http://bugs.sakaiproject.org/jira/browse/SAK-12175 -Create methods required for gb integration with the Assignment2 tool -getGradeDefinitionForStudentForItem - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From zqian@umich.edu Fri Jan 4 10:17:43 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.97]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 10:17:43 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 10:17:42 -0500 -Received: from creepshow.mr.itd.umich.edu (creepshow.mr.itd.umich.edu [141.211.14.84]) - by sleepers.mail.umich.edu () with ESMTP id m04FHgfs011536; - Fri, 4 Jan 2008 10:17:42 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY creepshow.mr.itd.umich.edu ID 477E4E0F.CCA4B.926 ; - 4 Jan 2008 10:17:38 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id BD02DBAC64; - Fri, 4 Jan 2008 15:17:34 +0000 (GMT) -Message-ID: <200801041515.m04FFv42007050@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 25 - for ; - Fri, 4 Jan 2008 15:17:11 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 5B396236B9 - for ; Fri, 4 Jan 2008 15:17:08 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04FFv85007052 - for ; Fri, 4 Jan 2008 10:15:57 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04FFv42007050 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:15:57 -0500 -Date: Fri, 4 Jan 2008 10:15:57 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to zqian@umich.edu using -f -To: source@collab.sakaiproject.org -From: zqian@umich.edu -Subject: [sakai] svn commit: r39757 - in assignment/trunk: assignment-impl/impl/src/java/org/sakaiproject/assignment/impl assignment-tool/tool/src/webapp/vm/assignment -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 10:17:42 2008 -X-DSPAM-Confidence: 0.7605 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39757 - -Author: zqian@umich.edu -Date: 2008-01-04 10:15:54 -0500 (Fri, 04 Jan 2008) -New Revision: 39757 - -Modified: -assignment/trunk/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java -assignment/trunk/assignment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm -Log: -fix to SAK-12604:Don't show groups/sections filter if the site doesn't have any - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From antranig@caret.cam.ac.uk Fri Jan 4 10:04:14 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.25]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 10:04:14 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 10:04:14 -0500 -Received: from holes.mr.itd.umich.edu (holes.mr.itd.umich.edu [141.211.14.79]) - by panther.mail.umich.edu () with ESMTP id m04F4Dci015108; - Fri, 4 Jan 2008 10:04:13 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY holes.mr.itd.umich.edu ID 477E4AE3.D7AF.31669 ; - 4 Jan 2008 10:04:05 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 933E3BAC17; - Fri, 4 Jan 2008 15:04:00 +0000 (GMT) -Message-ID: <200801041502.m04F21Jo007031@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 32 - for ; - Fri, 4 Jan 2008 15:03:15 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id AC2F6236B9 - for ; Fri, 4 Jan 2008 15:03:12 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04F21hn007033 - for ; Fri, 4 Jan 2008 10:02:01 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04F21Jo007031 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 10:02:01 -0500 -Date: Fri, 4 Jan 2008 10:02:01 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to antranig@caret.cam.ac.uk using -f -To: source@collab.sakaiproject.org -From: antranig@caret.cam.ac.uk -Subject: [sakai] svn commit: r39756 - in component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component: impl impl/spring/support impl/spring/support/dynamic impl/support util -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 10:04:14 2008 -X-DSPAM-Confidence: 0.6932 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39756 - -Author: antranig@caret.cam.ac.uk -Date: 2008-01-04 10:01:40 -0500 (Fri, 04 Jan 2008) -New Revision: 39756 - -Added: -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/ -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/dynamic/DynamicComponentManager.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/ -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicComponentRecord.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/DynamicJARManager.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/support/JARRecord.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/ByteToCharBase64.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/FileUtil.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordFileIO.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordReader.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/RecordWriter.java -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/util/StreamDigestor.java -Modified: -component/branches/SAK-12166/component-api/component/src/java/org/sakaiproject/component/impl/spring/support/ComponentsLoaderImpl.java -Log: -Temporary commit of incomplete work on JAR caching - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From gopal.ramasammycook@gmail.com Fri Jan 4 09:05:31 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.90]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 09:05:31 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 09:05:31 -0500 -Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76]) - by flawless.mail.umich.edu () with ESMTP id m04E5U3C029277; - Fri, 4 Jan 2008 09:05:30 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY guys.mr.itd.umich.edu ID 477E3D23.EE2E7.5237 ; - 4 Jan 2008 09:05:26 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 33C7856DC0; - Fri, 4 Jan 2008 14:05:26 +0000 (GMT) -Message-ID: <200801041403.m04E3psW006926@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 575 - for ; - Fri, 4 Jan 2008 14:05:04 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 3C0261D617 - for ; Fri, 4 Jan 2008 14:05:03 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04E3pQS006928 - for ; Fri, 4 Jan 2008 09:03:52 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04E3psW006926 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 09:03:51 -0500 -Date: Fri, 4 Jan 2008 09:03:51 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to gopal.ramasammycook@gmail.com using -f -To: source@collab.sakaiproject.org -From: gopal.ramasammycook@gmail.com -Subject: [sakai] svn commit: r39755 - in sam/branches/SAK-12065: samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation samigo-services/src/java/org/sakaiproject/tool/assessment/facade samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 09:05:31 2008 -X-DSPAM-Confidence: 0.7558 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39755 - -Author: gopal.ramasammycook@gmail.com -Date: 2008-01-04 09:02:54 -0500 (Fri, 04 Jan 2008) -New Revision: 39755 - -Modified: -sam/branches/SAK-12065/samigo-api/src/java/org/sakaiproject/tool/assessment/shared/api/grading/GradingSectionAwareServiceAPI.java -sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/QuestionScoresBean.java -sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/SubmissionStatusBean.java -sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/evaluation/TotalScoresBean.java -sam/branches/SAK-12065/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/SubmissionStatusListener.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueries.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/facade/PublishedAssessmentFacadeQueriesAPI.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/ifc/SectionAwareServiceHelper.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/integrated/SectionAwareServiceHelperImpl.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/integration/helper/standalone/SectionAwareServiceHelperImpl.java -sam/branches/SAK-12065/samigo-services/src/java/org/sakaiproject/tool/assessment/shared/impl/grading/GradingSectionAwareServiceImpl.java -Log: -SAK-12065 Gopal - Samigo Group Release. SubmissionStatus/TotalScores/Questions View filter. - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From david.horwitz@uct.ac.za Fri Jan 4 07:02:32 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.39]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 07:02:32 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 07:02:32 -0500 -Received: from guys.mr.itd.umich.edu (guys.mr.itd.umich.edu [141.211.14.76]) - by faithful.mail.umich.edu () with ESMTP id m04C2VN7026678; - Fri, 4 Jan 2008 07:02:31 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY guys.mr.itd.umich.edu ID 477E2050.C2599.3263 ; - 4 Jan 2008 07:02:27 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 6497FBA906; - Fri, 4 Jan 2008 12:02:11 +0000 (GMT) -Message-ID: <200801041200.m04C0gfK006793@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611 - for ; - Fri, 4 Jan 2008 12:01:53 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 5296342D3C - for ; Fri, 4 Jan 2008 12:01:53 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04C0gnm006795 - for ; Fri, 4 Jan 2008 07:00:42 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04C0gfK006793 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 07:00:42 -0500 -Date: Fri, 4 Jan 2008 07:00:42 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: david.horwitz@uct.ac.za -Subject: [sakai] svn commit: r39754 - in polls/branches/sakai_2-5-x: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 07:02:32 2008 -X-DSPAM-Confidence: 0.6526 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39754 - -Author: david.horwitz@uct.ac.za -Date: 2008-01-04 07:00:10 -0500 (Fri, 04 Jan 2008) -New Revision: 39754 - -Added: -polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/ -polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java -Removed: -polls/branches/sakai_2-5-x/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java -Modified: -polls/branches/sakai_2-5-x/.classpath -polls/branches/sakai_2-5-x/tool/pom.xml -polls/branches/sakai_2-5-x/tool/src/webapp/WEB-INF/requestContext.xml -Log: -svn log -r39753 https://source.sakaiproject.org/svn/polls/trunk ------------------------------------------------------------------------- -r39753 | david.horwitz@uct.ac.za | 2008-01-04 13:05:51 +0200 (Fri, 04 Jan 2008) | 1 line - -SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build ------------------------------------------------------------------------- -dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39753 https://source.sakaiproject.org/svn/polls/trunk polls/ -U polls/.classpath -A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers -A polls/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java -C polls/tool/src/webapp/WEB-INF/requestContext.xml -U polls/tool/pom.xml - -dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn resolved polls/tool/src/webapp/WEB-INF/requestContext.xml -Resolved conflicted state of 'polls/tool/src/webapp/WEB-INF/requestContext.xml - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From david.horwitz@uct.ac.za Fri Jan 4 06:08:27 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.98]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 06:08:27 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 06:08:27 -0500 -Received: from firestarter.mr.itd.umich.edu (firestarter.mr.itd.umich.edu [141.211.14.83]) - by casino.mail.umich.edu () with ESMTP id m04B8Qw9001368; - Fri, 4 Jan 2008 06:08:26 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY firestarter.mr.itd.umich.edu ID 477E13A5.30FC0.24054 ; - 4 Jan 2008 06:08:23 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 784A476D7B; - Fri, 4 Jan 2008 11:08:12 +0000 (GMT) -Message-ID: <200801041106.m04B6lK3006677@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 585 - for ; - Fri, 4 Jan 2008 11:07:56 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 1CACC42D0C - for ; Fri, 4 Jan 2008 11:07:58 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m04B6lWM006679 - for ; Fri, 4 Jan 2008 06:06:47 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m04B6lK3006677 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 06:06:47 -0500 -Date: Fri, 4 Jan 2008 06:06:47 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: david.horwitz@uct.ac.za -Subject: [sakai] svn commit: r39753 - in polls/trunk: . tool tool/src/java/org/sakaiproject/poll/tool tool/src/java/org/sakaiproject/poll/tool/evolvers tool/src/webapp/WEB-INF -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 06:08:27 2008 -X-DSPAM-Confidence: 0.6948 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39753 - -Author: david.horwitz@uct.ac.za -Date: 2008-01-04 06:05:51 -0500 (Fri, 04 Jan 2008) -New Revision: 39753 - -Added: -polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/ -polls/trunk/tool/src/java/org/sakaiproject/poll/tool/evolvers/SakaiFCKTextEvolver.java -Modified: -polls/trunk/.classpath -polls/trunk/tool/pom.xml -polls/trunk/tool/src/webapp/WEB-INF/requestContext.xml -Log: -SAK-12228 implmented workaround sugested by AB - needs to be tested against a trunk build - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From david.horwitz@uct.ac.za Fri Jan 4 04:49:08 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.92]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 04:49:08 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 04:49:08 -0500 -Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145]) - by score.mail.umich.edu () with ESMTP id m049n60G017588; - Fri, 4 Jan 2008 04:49:06 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY galaxyquest.mr.itd.umich.edu ID 477E010C.48C2.10259 ; - 4 Jan 2008 04:49:03 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 254CC8CDEE; - Fri, 4 Jan 2008 09:48:55 +0000 (GMT) -Message-ID: <200801040947.m049lUxo006517@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 246 - for ; - Fri, 4 Jan 2008 09:48:36 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 8C13342C92 - for ; Fri, 4 Jan 2008 09:48:40 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049lU3P006519 - for ; Fri, 4 Jan 2008 04:47:30 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049lUxo006517 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:47:30 -0500 -Date: Fri, 4 Jan 2008 04:47:30 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: david.horwitz@uct.ac.za -Subject: [sakai] svn commit: r39752 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css podcasts -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 04:49:08 2008 -X-DSPAM-Confidence: 0.6528 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39752 - -Author: david.horwitz@uct.ac.za -Date: 2008-01-04 04:47:16 -0500 (Fri, 04 Jan 2008) -New Revision: 39752 - -Modified: -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp -Log: -svn log -r39641 https://source.sakaiproject.org/svn/podcasts/trunk ------------------------------------------------------------------------- -r39641 | josrodri@iupui.edu | 2007-12-28 23:44:24 +0200 (Fri, 28 Dec 2007) | 1 line - -SAK-9882: refactored podMain.jsp the right way (at least much closer to) ------------------------------------------------------------------------- - -dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39641 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/ -C podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp -U podcasts/podcasts-app/src/webapp/css/podcaster.css - -conflict merged manualy - - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From david.horwitz@uct.ac.za Fri Jan 4 04:33:44 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.46]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 04:33:44 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 04:33:44 -0500 -Received: from workinggirl.mr.itd.umich.edu (workinggirl.mr.itd.umich.edu [141.211.93.143]) - by fan.mail.umich.edu () with ESMTP id m049Xge3031803; - Fri, 4 Jan 2008 04:33:42 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY workinggirl.mr.itd.umich.edu ID 477DFD6C.75DBE.26054 ; - 4 Jan 2008 04:33:35 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 6C929BA656; - Fri, 4 Jan 2008 09:33:27 +0000 (GMT) -Message-ID: <200801040932.m049W2i5006493@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 153 - for ; - Fri, 4 Jan 2008 09:33:10 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 6C69423767 - for ; Fri, 4 Jan 2008 09:33:13 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m049W3fl006495 - for ; Fri, 4 Jan 2008 04:32:03 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m049W2i5006493 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:32:02 -0500 -Date: Fri, 4 Jan 2008 04:32:02 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to david.horwitz@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: david.horwitz@uct.ac.za -Subject: [sakai] svn commit: r39751 - in podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp: css images podcasts -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 04:33:44 2008 -X-DSPAM-Confidence: 0.7002 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39751 - -Author: david.horwitz@uct.ac.za -Date: 2008-01-04 04:31:35 -0500 (Fri, 04 Jan 2008) -New Revision: 39751 - -Removed: -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/images/rss-feed-icon.png -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podPermissions.jsp -Modified: -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/css/podcaster.css -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podDelete.jsp -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podMain.jsp -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podNoResource.jsp -podcasts/branches/sakai_2-5-x/podcasts-app/src/webapp/podcasts/podOptions.jsp -Log: -svn log -r39146 https://source.sakaiproject.org/svn/podcasts/trunk ------------------------------------------------------------------------- -r39146 | josrodri@iupui.edu | 2007-12-12 21:40:33 +0200 (Wed, 12 Dec 2007) | 1 line - -SAK-9882: refactored the other pages as well to take advantage of proper jsp components as well as validation cleanup. ------------------------------------------------------------------------- -dhorwitz@david-horwitz-6:~/branchManagemnt/sakai_2-5-x> svn merge -c39146 https://source.sakaiproject.org/svn/podcasts/trunk podcasts/ -D podcasts/podcasts-app/src/webapp/podcasts/podPermissions.jsp -U podcasts/podcasts-app/src/webapp/podcasts/podDelete.jsp -U podcasts/podcasts-app/src/webapp/podcasts/podMain.jsp -U podcasts/podcasts-app/src/webapp/podcasts/podNoResource.jsp -U podcasts/podcasts-app/src/webapp/podcasts/podOptions.jsp -D podcasts/podcasts-app/src/webapp/images/rss-feed-icon.png -U podcasts/podcasts-app/src/webapp/css/podcaster.css - - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From stephen.marquard@uct.ac.za Fri Jan 4 04:07:34 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.25]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Fri, 04 Jan 2008 04:07:34 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Fri, 04 Jan 2008 04:07:34 -0500 -Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58]) - by panther.mail.umich.edu () with ESMTP id m0497WAN027902; - Fri, 4 Jan 2008 04:07:32 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY salemslot.mr.itd.umich.edu ID 477DF74E.49493.30415 ; - 4 Jan 2008 04:07:29 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 88598BA5B6; - Fri, 4 Jan 2008 09:07:19 +0000 (GMT) -Message-ID: <200801040905.m0495rWB006420@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 385 - for ; - Fri, 4 Jan 2008 09:07:04 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 90636418A8 - for ; Fri, 4 Jan 2008 09:07:04 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m0495sZs006422 - for ; Fri, 4 Jan 2008 04:05:54 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m0495rWB006420 - for source@collab.sakaiproject.org; Fri, 4 Jan 2008 04:05:53 -0500 -Date: Fri, 4 Jan 2008 04:05:53 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to stephen.marquard@uct.ac.za using -f -To: source@collab.sakaiproject.org -From: stephen.marquard@uct.ac.za -Subject: [sakai] svn commit: r39750 - event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Fri Jan 4 04:07:34 2008 -X-DSPAM-Confidence: 0.7554 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39750 - -Author: stephen.marquard@uct.ac.za -Date: 2008-01-04 04:05:43 -0500 (Fri, 04 Jan 2008) -New Revision: 39750 - -Modified: -event/branches/SAK-6216/event-util/util/src/java/org/sakaiproject/util/EmailNotification.java -Log: -SAK-6216 merge event change from SAK-11169 (r39033) to synchronize branch with 2-5-x (for convenience for UCT local build) - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From louis@media.berkeley.edu Thu Jan 3 19:51:21 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.91]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 19:51:21 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 19:51:21 -0500 -Received: from eyewitness.mr.itd.umich.edu (eyewitness.mr.itd.umich.edu [141.211.93.142]) - by jacknife.mail.umich.edu () with ESMTP id m040pJHB027171; - Thu, 3 Jan 2008 19:51:19 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY eyewitness.mr.itd.umich.edu ID 477D8300.AC098.32562 ; - 3 Jan 2008 19:51:15 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id E6CC4B9F8A; - Fri, 4 Jan 2008 00:36:06 +0000 (GMT) -Message-ID: <200801040023.m040NpCc005473@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 754 - for ; - Fri, 4 Jan 2008 00:35:43 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 8889842C49 - for ; Fri, 4 Jan 2008 00:25:00 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m040NpgM005475 - for ; Thu, 3 Jan 2008 19:23:51 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m040NpCc005473 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 19:23:51 -0500 -Date: Thu, 3 Jan 2008 19:23:51 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f -To: source@collab.sakaiproject.org -From: louis@media.berkeley.edu -Subject: [sakai] svn commit: r39749 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 19:51:20 2008 -X-DSPAM-Confidence: 0.6956 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39749 - -Author: louis@media.berkeley.edu -Date: 2008-01-03 19:23:46 -0500 (Thu, 03 Jan 2008) -New Revision: 39749 - -Modified: -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-importSites.vm -Log: -BSP-1420 Update text to clarify "Re-Use Materials..." option in WS Setup - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From louis@media.berkeley.edu Thu Jan 3 17:18:23 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.91]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 17:18:23 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 17:18:23 -0500 -Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58]) - by jacknife.mail.umich.edu () with ESMTP id m03MIMXY027729; - Thu, 3 Jan 2008 17:18:22 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY salemslot.mr.itd.umich.edu ID 477D5F23.797F6.16348 ; - 3 Jan 2008 17:18:14 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id EF439B98CE; - Thu, 3 Jan 2008 22:18:19 +0000 (GMT) -Message-ID: <200801032216.m03MGhDa005292@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 236 - for ; - Thu, 3 Jan 2008 22:18:04 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 905D53C2FD - for ; Thu, 3 Jan 2008 22:17:52 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03MGhrs005294 - for ; Thu, 3 Jan 2008 17:16:43 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03MGhDa005292 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:16:43 -0500 -Date: Thu, 3 Jan 2008 17:16:43 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to louis@media.berkeley.edu using -f -To: source@collab.sakaiproject.org -From: louis@media.berkeley.edu -Subject: [sakai] svn commit: r39746 - in bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src: bundle webapp/vm/sitesetup -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 17:18:23 2008 -X-DSPAM-Confidence: 0.6959 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39746 - -Author: louis@media.berkeley.edu -Date: 2008-01-03 17:16:39 -0500 (Thu, 03 Jan 2008) -New Revision: 39746 - -Modified: -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/bundle/sitesetupgeneric.properties -bspace/site-manage/sakai_2-4-x/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-siteInfo-duplicate.vm -Log: -BSP-1421 Add text to clarify "Duplicate Site" option in Site Info - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From ray@media.berkeley.edu Thu Jan 3 17:07:00 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.39]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 17:07:00 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 17:07:00 -0500 -Received: from anniehall.mr.itd.umich.edu (anniehall.mr.itd.umich.edu [141.211.93.141]) - by faithful.mail.umich.edu () with ESMTP id m03M6xaq014868; - Thu, 3 Jan 2008 17:06:59 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY anniehall.mr.itd.umich.edu ID 477D5C7A.4FE1F.22211 ; - 3 Jan 2008 17:06:53 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 0BC8D7225E; - Thu, 3 Jan 2008 22:06:57 +0000 (GMT) -Message-ID: <200801032205.m03M5Ea7005273@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 554 - for ; - Thu, 3 Jan 2008 22:06:34 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 2AB513C2FD - for ; Thu, 3 Jan 2008 22:06:23 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03M5EQa005275 - for ; Thu, 3 Jan 2008 17:05:14 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03M5Ea7005273 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 17:05:14 -0500 -Date: Thu, 3 Jan 2008 17:05:14 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to ray@media.berkeley.edu using -f -To: source@collab.sakaiproject.org -From: ray@media.berkeley.edu -Subject: [sakai] svn commit: r39745 - providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 17:07:00 2008 -X-DSPAM-Confidence: 0.7556 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39745 - -Author: ray@media.berkeley.edu -Date: 2008-01-03 17:05:11 -0500 (Thu, 03 Jan 2008) -New Revision: 39745 - -Modified: -providers/trunk/cm/cm-authz-provider/src/java/org/sakaiproject/coursemanagement/impl/provider/CourseManagementGroupProvider.java -Log: -SAK-12602 Fix logic when a user has multiple roles in a section - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From cwen@iupui.edu Thu Jan 3 16:34:40 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.34]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 16:34:40 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 16:34:40 -0500 -Received: from icestorm.mr.itd.umich.edu (icestorm.mr.itd.umich.edu [141.211.93.149]) - by chaos.mail.umich.edu () with ESMTP id m03LYdY1029538; - Thu, 3 Jan 2008 16:34:39 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY icestorm.mr.itd.umich.edu ID 477D54EA.13F34.26602 ; - 3 Jan 2008 16:34:36 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id CC710ADC79; - Thu, 3 Jan 2008 21:34:29 +0000 (GMT) -Message-ID: <200801032133.m03LX3gG005191@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 611 - for ; - Thu, 3 Jan 2008 21:34:08 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 43C4242B55 - for ; Thu, 3 Jan 2008 21:34:12 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LX3Vb005193 - for ; Thu, 3 Jan 2008 16:33:03 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LX3gG005191 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:33:03 -0500 -Date: Thu, 3 Jan 2008 16:33:03 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f -To: source@collab.sakaiproject.org -From: cwen@iupui.edu -Subject: [sakai] svn commit: r39744 - oncourse/branches/oncourse_OPC_122007 -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 16:34:40 2008 -X-DSPAM-Confidence: 0.9846 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39744 - -Author: cwen@iupui.edu -Date: 2008-01-03 16:33:02 -0500 (Thu, 03 Jan 2008) -New Revision: 39744 - -Modified: -oncourse/branches/oncourse_OPC_122007/ -oncourse/branches/oncourse_OPC_122007/.externals -Log: -update external for GB. - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From cwen@iupui.edu Thu Jan 3 16:29:07 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.46]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 16:29:07 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 16:29:07 -0500 -Received: from galaxyquest.mr.itd.umich.edu (galaxyquest.mr.itd.umich.edu [141.211.93.145]) - by fan.mail.umich.edu () with ESMTP id m03LT6uw027749; - Thu, 3 Jan 2008 16:29:06 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY galaxyquest.mr.itd.umich.edu ID 477D5397.E161D.20326 ; - 3 Jan 2008 16:28:58 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id DEC65ADC79; - Thu, 3 Jan 2008 21:28:52 +0000 (GMT) -Message-ID: <200801032127.m03LRUqH005177@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 917 - for ; - Thu, 3 Jan 2008 21:28:39 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 1FBB042B30 - for ; Thu, 3 Jan 2008 21:28:38 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LRUk4005179 - for ; Thu, 3 Jan 2008 16:27:30 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LRUqH005177 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:27:30 -0500 -Date: Thu, 3 Jan 2008 16:27:30 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f -To: source@collab.sakaiproject.org -From: cwen@iupui.edu -Subject: [sakai] svn commit: r39743 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 16:29:07 2008 -X-DSPAM-Confidence: 0.8509 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39743 - -Author: cwen@iupui.edu -Date: 2008-01-03 16:27:29 -0500 (Thu, 03 Jan 2008) -New Revision: 39743 - -Modified: -gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java -Log: -svn merge -c 39403 https://source.sakaiproject.org/svn/gradebook/trunk -U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java - -svn log -r 39403 https://source.sakaiproject.org/svn/gradebook/trunk ------------------------------------------------------------------------- -r39403 | wagnermr@iupui.edu | 2007-12-17 17:11:08 -0500 (Mon, 17 Dec 2007) | 3 lines - -SAK-12504 -http://jira.sakaiproject.org/jira/browse/SAK-12504 -Viewing "All Grades" page as a TA with grader permissions causes stack trace ------------------------------------------------------------------------- - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. - - - -From cwen@iupui.edu Thu Jan 3 16:23:48 2008 -Return-Path: -Received: from murder (mail.umich.edu [141.211.14.91]) - by frankenstein.mail.umich.edu (Cyrus v2.3.8) with LMTPA; - Thu, 03 Jan 2008 16:23:48 -0500 -X-Sieve: CMU Sieve 2.3 -Received: from murder ([unix socket]) - by mail.umich.edu (Cyrus v2.2.12) with LMTPA; - Thu, 03 Jan 2008 16:23:48 -0500 -Received: from salemslot.mr.itd.umich.edu (salemslot.mr.itd.umich.edu [141.211.14.58]) - by jacknife.mail.umich.edu () with ESMTP id m03LNlf0002115; - Thu, 3 Jan 2008 16:23:47 -0500 -Received: FROM paploo.uhi.ac.uk (app1.prod.collab.uhi.ac.uk [194.35.219.184]) - BY salemslot.mr.itd.umich.edu ID 477D525E.1448.30389 ; - 3 Jan 2008 16:23:44 -0500 -Received: from paploo.uhi.ac.uk (localhost [127.0.0.1]) - by paploo.uhi.ac.uk (Postfix) with ESMTP id 9D005B9D06; - Thu, 3 Jan 2008 21:23:38 +0000 (GMT) -Message-ID: <200801032122.m03LMFo4005148@nakamura.uits.iupui.edu> -Mime-Version: 1.0 -Content-Transfer-Encoding: 7bit -Received: from prod.collab.uhi.ac.uk ([194.35.219.182]) - by paploo.uhi.ac.uk (JAMES SMTP Server 2.1.3) with SMTP ID 6 - for ; - Thu, 3 Jan 2008 21:23:24 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (nakamura.uits.iupui.edu [134.68.220.122]) - by shmi.uhi.ac.uk (Postfix) with ESMTP id 3535542B69 - for ; Thu, 3 Jan 2008 21:23:24 +0000 (GMT) -Received: from nakamura.uits.iupui.edu (localhost [127.0.0.1]) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11) with ESMTP id m03LMFtT005150 - for ; Thu, 3 Jan 2008 16:22:15 -0500 -Received: (from apache@localhost) - by nakamura.uits.iupui.edu (8.12.11.20060308/8.12.11/Submit) id m03LMFo4005148 - for source@collab.sakaiproject.org; Thu, 3 Jan 2008 16:22:15 -0500 -Date: Thu, 3 Jan 2008 16:22:15 -0500 -X-Authentication-Warning: nakamura.uits.iupui.edu: apache set sender to cwen@iupui.edu using -f -To: source@collab.sakaiproject.org -From: cwen@iupui.edu -Subject: [sakai] svn commit: r39742 - gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui -X-Content-Type-Outer-Envelope: text/plain; charset=UTF-8 -X-Content-Type-Message-Body: text/plain; charset=UTF-8 -Content-Type: text/plain; charset=UTF-8 -X-DSPAM-Result: Innocent -X-DSPAM-Processed: Thu Jan 3 16:23:48 2008 -X-DSPAM-Confidence: 0.9907 -X-DSPAM-Probability: 0.0000 - -Details: http://source.sakaiproject.org/viewsvn/?view=rev&rev=39742 - -Author: cwen@iupui.edu -Date: 2008-01-03 16:22:14 -0500 (Thu, 03 Jan 2008) -New Revision: 39742 - -Modified: -gradebook/branches/oncourse_2-4-2/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java -Log: -svn merge -c 35014 https://source.sakaiproject.org/svn/gradebook/trunk -U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java - -svn log -r 35014 https://source.sakaiproject.org/svn/gradebook/trunk ------------------------------------------------------------------------- -r35014 | wagnermr@iupui.edu | 2007-09-12 16:17:59 -0400 (Wed, 12 Sep 2007) | 3 lines - -SAK-11458 -http://bugs.sakaiproject.org/jira/browse/SAK-11458 -Course grade does not appear on "All Grades" page if no categories in gb ------------------------------------------------------------------------- - - ----------------------- -This automatic notification message was sent by Sakai Collab (https://collab.sakaiproject.org/portal) from the Source site. -You can modify how you receive notifications at My Workspace > Preferences. diff --git a/Function/fun0_1.py b/Function/fun0_1.py deleted file mode 100644 index f509227..0000000 --- a/Function/fun0_1.py +++ /dev/null @@ -1,55 +0,0 @@ -""" - Functions in python - - There are mainly two types of function in python - 1. Built -in /(predefined) Function - 2. User define Function - - 1. Examples of built-in function - print(), input(), len(argument), range(argument), random(range) etc.. - 2. Examples of user define function - fun_name(arg1, arg2, arg3, ...., argn), display(), animal() - - syntax for user define function - for that we use keyword 'def' before defining a function - def fun_name(ar1, ar2, ar3, ......, arn): - instructions - ------ - ------ - ------ - ------ - ------ - fun_name(arg1, arg2,arg3, ........, angn) # calling a function - -""" -# Defining a function without parameters in python -def display(): - print("I am learning function in python") - -display() # calling function - -# Defining a function with parameter -def get_value(n): - print("Value is: ", n) - -get_value(30) # passing argument at the time of calling the function - -# Defining a function which will return a value -def give_data(n): - return n - -res = give_data(50) -print('Value return by function is: ', res) - -# At the time of defining a function set default values to the parameters -def set_default_value(a = 0, b = 0, c = 0): - return a+b+c - -sum1 = set_default_value() -print("Sum of three values: ", sum1) -sum2 = set_default_value(10, 30, 40) -print("Sum of three values: ", sum2) -sum3 = set_default_value(a = 10, b = 20) -print("sum of three values: ", sum3) - - diff --git a/Function/fun0_2.py b/Function/fun0_2.py deleted file mode 100644 index 12313f2..0000000 --- a/Function/fun0_2.py +++ /dev/null @@ -1,113 +0,0 @@ -# problem on functions -""" -# 1 Write a program to print even numbers using function and range is passed from main function -# defining function even -def even(ran): - for ev in range(0,ran+1, 2): - print(ev, end=' ') - -# defining main function like other languages and even function called from this function -def Main(): - n = int(input("Enter range: ")) - even(n) - -# To check existance of Main function -if __name__ == '__main__': - Main() - -""" - -""" -# 2. Write a program to print odd numbers using function and pass range from Main function -def odd(ran): - for od in range(1, ran+1, 2): - print(od, end=" ") -def Main(): - n = input("Enter range: ") - odd(int(n)) - -if __name__ == '__main__': - Main() -""" - -""" -# 3. Write a program using function to find factorial of a number -def fact(num): - - f = 1 - for i in range(1, num+1): - f*=i - return f -def Main(): - n = int(input("Ente number: ")) - f = fact(n) - print("Factorial of", n, 'is', f) - -if __name__ == '__main__': - Main() -""" - -""" -# 4. Write a program to print all paper sizes using function -def paper_size(l, b): - for i in range(9): - print("A"+str(i),'=', l, 'x', b) - t = l - l = b - b = t//2 - -paper_size(1189, 841) # Calling function -""" - -""" -# 5. Write a program to find all prime factor of a number -def PFact(n): - i =2 - res = 1 - while n >1: - while n%i!=0: - i += 1 - print(i,'x', end = ' ') - res *= i - n = n//i - return res - -def Main(): - flag = 1 - while flag: - num = int(input("Enter number: ")) - print("\nPrime Factor") - res = PFact(num) - print("\b\b=", res) - ch = input("Enter choice (yes/No)") - if ch!='yes': - flag = 0 - -if __name__ == '__main__': - Main() -""" -""" -# 6. Write a program using function to find prime numbers between a given range -def Prime(ran): - for i in range(2,ran+1): - for j in range(2, i+1): - if i%j == 0: - break - if i == j: - print(i, end = " ") - -def Main(): - flag = 1 - - while flag: - n = int(input("Enter range: ")) - Prime(n) - - ch = input("\nEnter (y/n)") - if ch != 'y': - flag = 0 -if __name__ == '__main__': - Main() -""" - - diff --git a/Function/infinite.py b/Function/infinite.py deleted file mode 100644 index d0554f2..0000000 --- a/Function/infinite.py +++ /dev/null @@ -1,21 +0,0 @@ -#passing n number arguments as parameter -def fun(*num): - - for n in num: - print(n, end = " ") - -fun(10, 20, 30, 40, 50) -print() - -def name(*people): - for person in people: - print(person) - -name("rupesh", "ram", "vaibhau", "Aakriti", "Anand") - -#passing argument as keyword - -def keyword(name = "someone", age = 0): - print("My name is "+str(name)+" and I am "+str(age)+" years old.") - -keyword(age = 21) # passing argument as keyword. \ No newline at end of file diff --git a/Function/recur0_1.py b/Function/recur0_1.py deleted file mode 100644 index 257720f..0000000 --- a/Function/recur0_1.py +++ /dev/null @@ -1,103 +0,0 @@ -""" -Recursive function is that function in which function calls itself again and again until base condition is not -found - -syntax - -def fun(): - if a == 0: # base condition in recursive function - return 1 - fun() # function calling itself -""" -""" -# 1. Write a program to find sum of natural number using recursive function -def sum_n(n): - s = 0 - if n == 1: - return 1 - else: - s = n + sum_n(n-1) - return s - -def Main(): - n = int(input("Enter number up-to you want to find sum: ")) - sm = sum_n(n) - - print("Sum of first", n , "natural number is ", sm) - -if __name__ == '__main__': - Main() -""" -""" -# 2. Write a program to print all natural number up-to given limit -def print_n(n): - - if n == 0: - return - print_n(n-1) - print(n, end = " ") - -ran = input("Enter range: ") -print_n(int(ran)) -""" - -""" -# 3. Write a program to find factorial of number using recursive function -def fact(n): - if n == 1: - return 1 - return n*fact(n-1) - -n = int(input("Enter number: ")) -f = fact(n) -print("Factorial of ", n, 'is', f) -""" - -""" -# 4. Write a program to print fibonacci sequence using recursive function -def fib(n): - if n == 0: - return 0 - if n == 1: - return 1 - return fib(n-1)+fib(n-2) - -n = int(input("Enter number up-to you want fibonacci sequence: ")) -print("Fibonacci sequence have total ",n, "terms" ) -for i in range(n+1): - print(fib(i), end = " ") -""" -""" - -# 5. Write a program to calculate the sum of the digits of a given number using recursive function -def sdigit(n): - if n == 0: - return 0 - return (n%10)+sdigit(n//10) - -def Main(): - num = int(input("Enter number: ")) - s = sdigit(num) - print('Sum = ', s) - -if __name__ == '__main__': - Main() -""" - -""" -# 6. Write a program to obtain the prime factor of the number -def PF(n): - i = 2 - if n == 1: - return 1 - while n%i != 0: - i += 1 - print(i,' x ', end = ' ') - return i*PF(n//i) - -num = int(input("Enter number: ")) -print("\b\b\b = ", PF(num)) -""" - - - diff --git a/Function/tower.py b/Function/tower.py deleted file mode 100644 index 78399b3..0000000 --- a/Function/tower.py +++ /dev/null @@ -1,19 +0,0 @@ - -# In this program we have three towers and in first tower we have rings and we have to shift the rings -# from source to destination -# we will use recursive approach to solve this problem - -def sd(ndisk, t1, t2, t3): - if ndisk == 1: - print('Move disk', ndisk,'from', t1, ' -> ', t3) - return - sd(ndisk-1, t1, t3, t2) - print('Move disk',ndisk,'from', t1, ' -> ', t3) - sd(ndisk-1, t2, t1, t3) - -source = 'A' -temp = 'B' -dest = 'C' - -ndisk = int(input("Enter number of disk: ")) -sd(ndisk, source, temp, dest) \ No newline at end of file diff --git a/Lesson_1/practice1_0.py b/Lesson_1/practice1_0.py deleted file mode 100644 index 862be9b..0000000 --- a/Lesson_1/practice1_0.py +++ /dev/null @@ -1,31 +0,0 @@ -''' - I have used multiline cursur functionality of vs code - using keys (ctrl + alt + up&Down arrow key ) -''' -#method one to print multiple line -print("Twinkle, twinkle, little star") -print("How I wonder what you are") -print("Up above the world so high") -print("Like a diamond in the sky") -print("Twinkle, twinkle, little star") -print("How I wonder what you are") -print("Twinkle, twinkle, little star") -print("How I wonder what you are") -print("Up above the world so high") -print("Like a diamond in the sky") -print("Twinkle, twinkle, little star") -print("How I wonder what you are") - -#method 2 to print multiple line -print('''Twinkle, twinkle, little star -How I wonder what you are -Up above the world so high -Like a diamond in the sky -Twinkle, twinkle, little star -How I wonder what you are -Twinkle, twinkle, little star -How I wonder what you are -Up above the world so high -Like a diamond in the sky -Twinkle, twinkle, little star -How I wonder what you are''') \ No newline at end of file diff --git a/Lesson_1/practice1_1.py b/Lesson_1/practice1_1.py deleted file mode 100644 index 0da0b38..0000000 --- a/Lesson_1/practice1_1.py +++ /dev/null @@ -1,8 +0,0 @@ -import pyttsx3 -import time -engine = pyttsx3.init() -engine.say("This is a program for speech. And your can understand the power of computer.") - -time.sleep(2) -engine.say("You have waited for 2 second and then you are saying second line") -engine.runAndWait() \ No newline at end of file diff --git a/Lesson_1/practice1_3.py b/Lesson_1/practice1_3.py deleted file mode 100644 index 790bfaa..0000000 --- a/Lesson_1/practice1_3.py +++ /dev/null @@ -1,3 +0,0 @@ -import os -#this below line will print all the directory present in this folder in list format. -print(os.listdir()) \ No newline at end of file diff --git a/Lesson_1/practice1_4.py b/Lesson_1/practice1_4.py deleted file mode 100644 index 2c5416c..0000000 --- a/Lesson_1/practice1_4.py +++ /dev/null @@ -1,4 +0,0 @@ -#In this program I am playing a mp3 song using playsound module of python -from playsound import playsound - -playsound("C:\\Users\\rupes\\Videos\\Captures\\Audio\\song2.mp3") \ No newline at end of file diff --git a/Lesson_1/practice1_5.py b/Lesson_1/practice1_5.py deleted file mode 100644 index 356c92d..0000000 --- a/Lesson_1/practice1_5.py +++ /dev/null @@ -1,35 +0,0 @@ -# importing libraries -import cv2 -import numpy as np - -# Create a VideoCapture object and read from input file -cap = cv2.VideoCapture('C:\\Users\\rupes\\Videos\\Youtube\\videoplayback.mp4') - -# Check if camera opened successfully -if (cap.isOpened()== False): - print("Error opening video file") - -# Read until video is completed -while(cap.isOpened()): - - # Capture frame-by-frame - ret, frame = cap.read() - if ret == True: - - # Display the resulting frame - cv2.imshow('Frame', frame) - - # Press Q on keyboard to exit - if cv2.waitKey(40) & 0xFF == ord('q'): - break - - # Break the loop - else: - break - -# When everything done, release -# the video capture object -cap.release() - -# Closes all the frames -cv2.destroyAllWindows() \ No newline at end of file diff --git a/Lesson_1/prog1_0.py b/Lesson_1/prog1_0.py deleted file mode 100644 index 92f30b9..0000000 --- a/Lesson_1/prog1_0.py +++ /dev/null @@ -1,5 +0,0 @@ -#first program -#when we type python on cmd then we see a prompt that prompt is known as REPL(Read evaluate print loop) -# we can use REPL as calculator to perform some mathematical operations -# To exit from the REPL use 'exit()' as it is this function shuts REPL. -print("Hello world") diff --git a/Lesson_1/prog1_1.py b/Lesson_1/prog1_1.py deleted file mode 100644 index 43ba8e1..0000000 --- a/Lesson_1/prog1_1.py +++ /dev/null @@ -1,10 +0,0 @@ -#importing time module -#A module is set of program written by someone else and we can use these program to perform our task. -'''In this program I have imported a time module to wait for some seconds. -To install any module we can use command "pip module name" -''' -import time - -print("waiting for 2 seconds") -time.sleep(2) -print("waited for 2 second and then print this line") \ No newline at end of file diff --git a/Lesson_2/practice2_0.py b/Lesson_2/practice2_0.py deleted file mode 100644 index 8cf772e..0000000 --- a/Lesson_2/practice2_0.py +++ /dev/null @@ -1,5 +0,0 @@ -# program to add two integers -a = int(input("Enter first number: ")) -b = int(input("Enter second number: ")) - -print("sum of",a , " and ", b, " is: ", a+b) \ No newline at end of file diff --git a/Lesson_2/practice2_1.py b/Lesson_2/practice2_1.py deleted file mode 100644 index 1339d88..0000000 --- a/Lesson_2/practice2_1.py +++ /dev/null @@ -1,4 +0,0 @@ -#program to find the remainder of a number when divided by 2 - -num = int(input("Enter a number: ")) -print("Remainder is: ", num%2) \ No newline at end of file diff --git a/Lesson_2/practice2_2.py b/Lesson_2/practice2_2.py deleted file mode 100644 index 2fc596a..0000000 --- a/Lesson_2/practice2_2.py +++ /dev/null @@ -1,9 +0,0 @@ -# program to check that given number is greater or not -num1 = int(input("Enter first number : ")) -num2 = int(input("Enter second number : ")) - -print(num1, "is greater than", num2, " : ", num1>num2) - -# Below code is for calculating square of a number -n = int(input("Enter a number: ")) -print(n,'^2 = ', n**2) \ No newline at end of file diff --git a/Problems/TextAlign.py b/Problems/TextAlign.py deleted file mode 100644 index 2578e5b..0000000 --- a/Problems/TextAlign.py +++ /dev/null @@ -1,24 +0,0 @@ -# Replace all ______ with rjust, ljust or center. - -thickness = int(input()) # This must be an odd number -c = 'H' - -# Top Cone -for i in range(thickness): - print((c*i).rjust(thickness-1)+c+(c*i).ljust(thickness-1)) - -# Top Pillars -for i in range(thickness+1): - print((c*thickness).center(thickness*2)+(c*thickness).center(thickness*6)) - -# Middle Belt -for i in range((thickness+1)//2): - print((c*thickness*5).center(thickness*6)) - -# Bottom Pillars -for i in range(thickness+1): - print((c*thickness).center(thickness*2)+(c*thickness).center(thickness*6)) - -# Bottom Cone -for i in range(thickness): - print(((c*(thickness-i-1)).rjust(thickness)+c+(c*(thickness-i-1)).ljust(thickness)).rjust(thickness*6)) \ No newline at end of file diff --git a/Problems/calculator.py b/Problems/calculator.py deleted file mode 100644 index c1ff470..0000000 --- a/Problems/calculator.py +++ /dev/null @@ -1,8 +0,0 @@ -def simple_cal(n1, n2): - - print("Sum of "+str(n1)+" and "+str(n2)+" is=", n1+n2) - print("Sub of "+str(n1)+" and "+str(n2)+" is=", n1-n2) - print("Multiplication of "+str(n1)+" and "+str(n2)+" is=" , n1*n2) - print("Division of "+str(n1)+" and "+str(n2)+" is=", n1/n2) - -simple_cal(20, 10) \ No newline at end of file diff --git a/Problems/capitilize.py b/Problems/capitilize.py deleted file mode 100644 index 236acf4..0000000 --- a/Problems/capitilize.py +++ /dev/null @@ -1,19 +0,0 @@ -s = input() - -s = s.split(" ") - -new = [] - -for word in s: - s1 = '' - for i in range(len(word)): - if i == 0: - s1+=word[i].upper() - else: - s1+=word[i] - new.append(s1) - - -s2 = " ".join(new) - -print(s2) \ No newline at end of file diff --git a/Problems/cm.py b/Problems/cm.py deleted file mode 100644 index 9dec9a0..0000000 --- a/Problems/cm.py +++ /dev/null @@ -1,25 +0,0 @@ -""" -program to check duplicasy in given list of string -""" - -list1 = list() -list2 = list() - -#Taking input from the user and add it to the list1 -for i in range(20): - str1 = input("Enter string: ") - list1.append(str1) - -#Removing common sequence from each string in list1 -for word in list1: - str2 = '' - for letter in word: - if letter in str2: - continue - else: - str2 = str2+letter - list2.append(str2) - -print(list1) -print('\n\n\n') -print(list2) diff --git a/Problems/diagonal.py b/Problems/diagonal.py deleted file mode 100644 index e545ee1..0000000 --- a/Problems/diagonal.py +++ /dev/null @@ -1,26 +0,0 @@ -m = [] -n = int(input("Enter number: ")) -sum1 = 0; sum2 = 0 -print("Enter values in matrix") -for i in range(n): - ls = [] - for j in range(n): - n1 = int(input()) - ls.append(n1) - m.append(ls) - -r = 0; c = n -for i in range(n): - for j in range(n): - print(m[i][j], end=" ") - if i == j: - sum1 = sum1+m[i][j] - if i == r and j == c-1: - sum2 = sum2+m[i][j] - r = r+1 - c = c-1 - - print('\n') - -print("Sum is both diagonal element is", sum1, sum2) -print("Difference of diagonal sum is ", abs(sum1-sum2)) diff --git a/Problems/dictionary.py b/Problems/dictionary.py deleted file mode 100644 index 20fbb5e..0000000 --- a/Problems/dictionary.py +++ /dev/null @@ -1,15 +0,0 @@ -n = int(input()) -student_marks = {} -sum = 0 -for i in range(n): - name, *line = input().split() - scores = list(map(float, line)) - student_marks[name] = scores -query_name = input() - -for key in student_marks: - if key == query_name: - for i in range(len(student_marks[key])): - sum += student_marks[key][i] - avg = sum / len(student_marks[key]) -print("%0.2f"%avg) \ No newline at end of file diff --git a/Problems/fizzbuzz.py b/Problems/fizzbuzz.py deleted file mode 100644 index 6bcdac3..0000000 --- a/Problems/fizzbuzz.py +++ /dev/null @@ -1,18 +0,0 @@ -#fizzbuzz program for play -while(1): - num = int(input("Say number= ")) - if(num%3 == 0 and num%5 == 0): - print(str(num)+" = FizzBuzz") - else: - if(num%3 == 0): - print(str(num)+" = Fizz") - else: - if (num%5 == 0): - print(str(num)+" = Buzz") - else: - print(str(num)) - choice = input("Continue(y/n)") - if(choice == 'n'): - break - -print("Thank you for playing the game") \ No newline at end of file diff --git a/Problems/guess.py b/Problems/guess.py deleted file mode 100644 index cdef09e..0000000 --- a/Problems/guess.py +++ /dev/null @@ -1,26 +0,0 @@ -# number guessing game - -import random as ra - -guess = ra.randint(1, 20) - -cnt = 3 - -while(1): - num = int(input("Enter a number: ")) - - if num == guess: - print("Well played") - break; - else: - print("You have "+str(cnt-1)+" chances") - - cnt-=1 - - if cnt == 0: - print("You lost the game try next time") - break; - - - - diff --git a/Problems/immutable.py b/Problems/immutable.py deleted file mode 100644 index c1cc1a4..0000000 --- a/Problems/immutable.py +++ /dev/null @@ -1,18 +0,0 @@ -# Make immutable string mutable -# Method 1 - -def add_char(s, pos, c): - s = s[0:pos]+c+s[pos+1 : ] - return s - -# Defining main function as similar to c language -def Main(): - s = input() - p, c = input().split() - print(add_char(s, int(p), c)) - -# Below written code is checking existance of Main() function -if __name__ == '__main__': - Main() - - diff --git a/Problems/jumb.py b/Problems/jumb.py deleted file mode 100644 index d20237f..0000000 --- a/Problems/jumb.py +++ /dev/null @@ -1,66 +0,0 @@ -#Game to guess the jumbling word -import random as rand - -def choose(): - words = ['boat', 'rainbow', 'dog', 'lion','pizza', 'village','bear', 'gang', 'dictionary','dear', 'door', 'dumb','during','doodle','root'] - pick = rand.choice(words) - return pick - -def jumble(word): - jumb = "".join(rand.sample(word, len(word))) - return jumb - -def thank(p1n, p2n, p1, p2): - print(p1n, " your score is ", p1) - print(p2n, " your score is ", p2) - if(p1 == p2): - print("Game Draw ") - elif(p1>p2): - print("Winner is ", p1n) - else: - print("Winner is ", p2n) - print("Thank you for playing") - -def play(): - p1name = input("Enter your name ") - p2name = input("Enter your name ") - p1s = 0 - p2s = 0 - turn = 0 - while(1): - #computer task - picked_word = choose() - - #jumbling the word - qn = jumble(picked_word) - print(qn) - - #player 1 task - if(turn%2 == 0): - print("Your turn ", p1name) - ans = input("Enter word ") - if(ans == picked_word): - p1s = p1s+1 - else: - print("Better luck, try next time") - print("picked word is ", picked_word) - choice = int(input("Enter 1 to continue 0 to exit")) - if(choice == 0): - thank(p1name, p2name, p1s, p2s) - break - #player 2 task - else: - print("Your turn ", p2name) - ans = input("Enter word ") - if(ans == picked_word): - p2s = p2s+1 - else: - print("Better luck, try next time") - print("picked word is ", picked_word) - choice = int(input("Enter 1 to continue 0 to exit")) - if(choice == 0): - thank(p1name, p2name, p1s, p2s) - break - turn = turn+1 - -play() \ No newline at end of file diff --git a/Problems/list0_1.py b/Problems/list0_1.py deleted file mode 100644 index 688d248..0000000 --- a/Problems/list0_1.py +++ /dev/null @@ -1,19 +0,0 @@ -ls = [70, 20 ,30 ,5, 6 , 10, 30] - -mn = ls[0] - -mx = ls[0] - -sm = 0 -for v in ls: - if mn>v: - mn = v - if mx ls[j]: - mn = j - - if i != mn: - t = ls[mn] - ls[mn] = ls[i] - ls[i] = t - -print("Sorted list: ") -print(ls) \ No newline at end of file diff --git a/Problems/listcomprehension.py b/Problems/listcomprehension.py deleted file mode 100644 index 93df165..0000000 --- a/Problems/listcomprehension.py +++ /dev/null @@ -1,17 +0,0 @@ -x = int(input("x = ")) -y = int(input("y = ")) -z = int(input("z = ")) -n = int(input("n = ")) - -result = [] -for i in range(x+1): - for j in range(y+1): - ls = [] - for k in range(z+1): - if i+j+k!=n: - ls = [i, j, k] - result.append(ls) - - -print(result) - diff --git a/Problems/listoperation.py b/Problems/listoperation.py deleted file mode 100644 index 80af621..0000000 --- a/Problems/listoperation.py +++ /dev/null @@ -1,19 +0,0 @@ -N = int(input()) - -l = [] -for i in range(N): - ls = input().split() # input().split() creates a list of string and then we can convert elements according to us - if ls[0] == "insert": - l.insert(int(ls[1]), int(ls[2])) - elif ls[0] == "print": - print(l) - elif ls[0] == "remove": - l.remove(int(ls[1])) - elif ls[0] == "append": - l.append(int(ls[1])) - elif ls[0] == "sort": - l.sort() - elif ls[0] == "pop": - l.pop() - else: - l.reverse() diff --git a/Problems/nestedlist.py b/Problems/nestedlist.py deleted file mode 100644 index 69768ec..0000000 --- a/Problems/nestedlist.py +++ /dev/null @@ -1,52 +0,0 @@ -n = int(input()) - -ls = [] -score_list = [] -final_name = []; sort_name_list = [] - -# In this code we are adding list of name and score -for i in range(n): - t = [] - name = input() - score = float(input()) - t = [name, score] - score_list.append(score) - ls.append(t) - -# sorting score list element in ascending order -for i in range(len(score_list)): - for j in range(i+1, len(score_list)): - if score_list[i] > score_list[j]: - t = score_list[i] - score_list[i] = score_list[j] - score_list[j] = t - -# finding second least element from the score list -second_least = score_list[1] -for i in range(2, len(score_list)): - if second_least == score_list[0]: - second_least = score_list[i] - -# Adding name that satisfies our condition -for l in ls: - if second_least == l[1]: - final_name.append(l[0]) - -# sorting the final name list in alphabetical order -final_name.sort() -# alternate method to do sorting -# for i in range(len(final_name)): -# for j in range(i+1, len(final_name)): -# if final_name[i]>final_name[j]: -# t = final_name[i] -# final_name[i] = final_name[j] -# final_name[j] = t -# sort_name_list.append(final_name[i]) - -# print name from the final list -for name in final_name: - print(name) - - - - diff --git a/Problems/perform.py b/Problems/perform.py deleted file mode 100644 index 70c4cf9..0000000 --- a/Problems/perform.py +++ /dev/null @@ -1,9 +0,0 @@ -def fun(*a): - sm = 0; pr = 1 - for i in range(len(a)): - sm = sm+a[i] - pr = pr*a[i] - print("Sum is=", sm) - print("Product is= ", pr) - -fun(10, 12, 30, 40, 50, 60, 70, 80, 100, 50, 30, 10) \ No newline at end of file diff --git a/Problems/runnre.py b/Problems/runnre.py deleted file mode 100644 index 5ca769e..0000000 --- a/Problems/runnre.py +++ /dev/null @@ -1,19 +0,0 @@ -n = int(input()) -arr = map(int, input().split()) - -ls = list(arr) - -# Arranging list element in descending order -for i in range(n): - for j in range(i+1, n): - if ls[i] < ls[j]: - t = ls[i] - ls[i] = ls[j] - ls[j] = t - -# Find the second max value as runner-up score -score = ls[1] -for i in range(2, n): - if score == ls[0]: - score = ls[i] -print(score) \ No newline at end of file diff --git a/Problems/simpleinterest.py b/Problems/simpleinterest.py deleted file mode 100644 index 0dbaf14..0000000 --- a/Problems/simpleinterest.py +++ /dev/null @@ -1,7 +0,0 @@ -def simple_int(prin, r = 10, t = 5): - - sm_int = (prin*r*t)/100 - - return sm_int - -print("Simple interest upon 5000 is =", simple_int(prin = 5000)) \ No newline at end of file diff --git a/Problems/split_join.py b/Problems/split_join.py deleted file mode 100644 index 530ef17..0000000 --- a/Problems/split_join.py +++ /dev/null @@ -1,9 +0,0 @@ -# split and join a string using predefined function split() and join(arg) -def split_join(str): - str = str.split() - str = '-'.join(str) - return str - -if __name__ == '__main__': - s = input() - print(split_join(s)) \ No newline at end of file diff --git a/Problems/string.py b/Problems/string.py deleted file mode 100644 index 1584992..0000000 --- a/Problems/string.py +++ /dev/null @@ -1,17 +0,0 @@ -s1 = input() -s2 = input() - -t = tuple() - -for i in range(len(s1)): - j = 1 - if s1[i:len(s2)+i] == s2: - print(s1[i:len(s2)+i]) - if i==0: - t = (i, len(s2)-1) - else: - t = (i, len(s2)+i-j) - print(t) - j+=1 - - diff --git a/Problems/string0_1.py b/Problems/string0_1.py deleted file mode 100644 index 8602137..0000000 --- a/Problems/string0_1.py +++ /dev/null @@ -1,13 +0,0 @@ -def swap_case(s): - s2 = "" - for i in range(len(s)): - if s.upper()[i] == s[i]: - s2 += s.lower()[i] - elif s.lower()[i] == s[i]: - s2 += s.upper()[i] - return s2 - -if __name__ == "__main__": - s3 = swap_case(input()) - print(s3) - diff --git a/Problems/string0_2.py b/Problems/string0_2.py deleted file mode 100644 index 93ca5f3..0000000 --- a/Problems/string0_2.py +++ /dev/null @@ -1,19 +0,0 @@ -# count total number of substring in a original string - -def count_number(s1, s2): - s1 = "".join(s1) - s2 = "".join(s2) - count = 0 - for i in range(len(s1)): - if s1[i:len(s2)+i] == s2: - count+=1 - return count - -def Main(): - s1 = input().split() - s2 = input().split() - n = count_number(s1, s2) - print(n) - -if __name__ == '__main__': - Main() diff --git a/Problems/string0_3.py b/Problems/string0_3.py deleted file mode 100644 index c0b467e..0000000 --- a/Problems/string0_3.py +++ /dev/null @@ -1,8 +0,0 @@ -s = input() - -print(any(c.isalnum() for c in s)) -print(any(c.isalpha() for c in s)) -print(any(c.isdigit() for c in s)) -print(any(c.islower() for c in s)) -print(any(c.isupper() for c in s)) - diff --git a/Problems/tripletcomp.py b/Problems/tripletcomp.py deleted file mode 100644 index 0c608ae..0000000 --- a/Problems/tripletcomp.py +++ /dev/null @@ -1,19 +0,0 @@ -a = []; b = [] - -result = [] - -a_count = 0; b_count = 0 - -a = input().split() -b = input().split() - -for i in range(len(a)): - if a[i] > b[i]: - a_count = a_count+1 - if a[i] < b[i]: - b_count = b_count+1 -result.append(a_count) -result.append(b_count) - -for i in result: - print(i, end = " ") \ No newline at end of file diff --git a/Problems/tuple.py b/Problems/tuple.py deleted file mode 100644 index b8e3535..0000000 --- a/Problems/tuple.py +++ /dev/null @@ -1,7 +0,0 @@ -n = int(input()) - -x = map(int, input().split()) - -t = tuple(x) - -print(hash(t)) \ No newline at end of file diff --git a/Projects/Project_1/Calculator.py b/Projects/Project_1/Calculator.py deleted file mode 100644 index 2686952..0000000 --- a/Projects/Project_1/Calculator.py +++ /dev/null @@ -1,50 +0,0 @@ -""" -In this program I am going to make calculator same as real world calculator - -""" - -def calculator(): - - result = 0; - - print("Enter '+' to add") - print("Enter '-' to subtract") - print("Enter '*' to multiply") - print("Enter '/' to divide") - print("Enter 'q' to exit") - - str = input("= ").split(' ') - number1 = int(str[0]) - ch = str[1] - number2 = int(str[2]) - - - while True: - - if ch == '+': - result = number1 + number2 - elif ch == '-': - result = number1 - number2 - elif ch == '*': - result = number1 * number2 - elif ch == '/': - result = number1 // number2 - - s = input().split(" ") - number1 = result - ch = s[0] - if ch == 'q': - print("Ans = ", result) - break - - number3 = int(s[1]) - number2 = number3 - - - -calculator() - - - - - diff --git a/Python Notes/0. Introduction/Chapter 0.pdf b/Python Notes/0. Introduction/Chapter 0.pdf deleted file mode 100644 index 9ee4823..0000000 Binary files a/Python Notes/0. Introduction/Chapter 0.pdf and /dev/null differ diff --git a/Python Notes/0. Introduction/testFile.txt b/Python Notes/0. Introduction/testFile.txt deleted file mode 100644 index 274c005..0000000 --- a/Python Notes/0. Introduction/testFile.txt +++ /dev/null @@ -1 +0,0 @@ -1234 \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/.vscode/settings.json b/Python Notes/1. Chapter 1/.vscode/settings.json deleted file mode 100644 index dd7992b..0000000 --- a/Python Notes/1. Chapter 1/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.pythonPath": "C:\\Python\\python.exe" -} \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/01_hello.py b/Python Notes/1. Chapter 1/01_hello.py deleted file mode 100644 index 6d95fe9..0000000 --- a/Python Notes/1. Chapter 1/01_hello.py +++ /dev/null @@ -1 +0,0 @@ -print("Hello world") \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/02_comments.py b/Python Notes/1. Chapter 1/02_comments.py deleted file mode 100644 index 4b07614..0000000 --- a/Python Notes/1. Chapter 1/02_comments.py +++ /dev/null @@ -1,13 +0,0 @@ -''' -Multiline comment -Author: Harry -Date: -Time: -''' - -import time - -print('Waiting for 1 second') -# Feel free to change the delay as per the instructions from your boss -time.sleep(1) -print('Waiting for 1 second completed') diff --git a/Python Notes/1. Chapter 1/03_mod.py b/Python Notes/1. Chapter 1/03_mod.py deleted file mode 100644 index a3fe1a8..0000000 --- a/Python Notes/1. Chapter 1/03_mod.py +++ /dev/null @@ -1,6 +0,0 @@ -import time -# import flask - -# Waiting for 2 seconds -time.sleep(2) -print("2 Seconds have passed since this program ran") \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/04_practice_1.py b/Python Notes/1. Chapter 1/04_practice_1.py deleted file mode 100644 index 8e2ae43..0000000 --- a/Python Notes/1. Chapter 1/04_practice_1.py +++ /dev/null @@ -1,25 +0,0 @@ -# print("Twinkle, twinkle, little star") -# print("How I wonder what you are") -# print("Up above the world so high") -# print("Like a diamond in the sky") -# print("Twinkle, twinkle little star") -# print("How I wonder what you are") -# print("When the blazing sun is gone") -# print("When he nothing shines upon") -# print("Then you show your little light") -# print("Twinkle, twinkle, all the night") -# print("Twinkle, twinkle, little star") -# print("How I wonder what you are") - -print('''Twinkle, twinkle, little star -How I wonder what you are -Up above the world so high -Like a diamond in the sky -Twinkle, twinkle little star -How I wonder what you are -When the blazing sun is gone -When he nothing shines upon -Then you show your little light -Twinkle, twinkle, all the night -Twinkle, twinkle, little star -How I wonder what you are''') diff --git a/Python Notes/1. Chapter 1/05_practice_3.py b/Python Notes/1. Chapter 1/05_practice_3.py deleted file mode 100644 index 8915d70..0000000 --- a/Python Notes/1. Chapter 1/05_practice_3.py +++ /dev/null @@ -1,4 +0,0 @@ -import pyttsx3 -engine = pyttsx3.init() -engine.say("Hey Harry I am a python module. Welcome to the world of Python") -engine.runAndWait() \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/06_practice_4.py b/Python Notes/1. Chapter 1/06_practice_4.py deleted file mode 100644 index 1c8b7f8..0000000 --- a/Python Notes/1. Chapter 1/06_practice_4.py +++ /dev/null @@ -1,5 +0,0 @@ -# Author: Harry -# Organization: ProgrammingWithHarry - -import os # Importing the module -print(os.listdir()) # Function to display all the directory content \ No newline at end of file diff --git a/Python Notes/1. Chapter 1/Chapter 1 - Practice set.pdf b/Python Notes/1. Chapter 1/Chapter 1 - Practice set.pdf deleted file mode 100644 index 0d42357..0000000 Binary files a/Python Notes/1. Chapter 1/Chapter 1 - Practice set.pdf and /dev/null differ diff --git a/Python Notes/1. Chapter 1/Chapter 1 Python.pdf b/Python Notes/1. Chapter 1/Chapter 1 Python.pdf deleted file mode 100644 index e32cf66..0000000 Binary files a/Python Notes/1. Chapter 1/Chapter 1 Python.pdf and /dev/null differ diff --git a/Python Notes/1. Chapter 1/play.mp3 b/Python Notes/1. Chapter 1/play.mp3 deleted file mode 100644 index 149bf46..0000000 Binary files a/Python Notes/1. Chapter 1/play.mp3 and /dev/null differ diff --git a/Python Notes/10. Chapter 10/01_class.py b/Python Notes/10. Chapter 10/01_class.py deleted file mode 100644 index 1418f42..0000000 --- a/Python Notes/10. Chapter 10/01_class.py +++ /dev/null @@ -1,10 +0,0 @@ -# A very basic sample class -class Employee: - name = "Harry" - marks = 34 - center = "Delhi" - -harry = Employee() # A basic object -print(harry.marks) -print(harry.center) -print(harry.name) \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/02_classwithmethods.py b/Python Notes/10. Chapter 10/02_classwithmethods.py deleted file mode 100644 index efec5f4..0000000 --- a/Python Notes/10. Chapter 10/02_classwithmethods.py +++ /dev/null @@ -1,18 +0,0 @@ -# A very basic sample class -class Employee: - name = "Harry" - marks = 34 - center = "Delhi" - - def printObj(self): - print(f"The name is {self.name}") - - - -harry = Employee() # A basic object -shyam = Employee() # A basic object -print(harry.marks) -print(harry.center) -print(harry.name) -harry.printObj() # Employee.printObj(harry) -# Employee.printObj(harry) \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/03_classattributes.py b/Python Notes/10. Chapter 10/03_classattributes.py deleted file mode 100644 index 238bd8d..0000000 --- a/Python Notes/10. Chapter 10/03_classattributes.py +++ /dev/null @@ -1,24 +0,0 @@ -# A very basic sample class -class Employee: - name = "Harry" # A class attribute - marks = 34 - center = "Delhi" - - def printObj(self): - print(f"The name is {self.name}") - - @staticmethod - def greet(): - print("good day") - - -Employee.name = "HarryNew" # Setting a class attribute for Employee -harry = Employee() # A basic object -shyam = Employee() # A basic object -print(harry.name) -print(shyam.name) -shyam.name = "Shyam" # Setting an instance attribute to shyam -print(shyam.name) -print(harry.name) -harry.greet() -Employee.greet() \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/04_constructor.py b/Python Notes/10. Chapter 10/04_constructor.py deleted file mode 100644 index 2277e4c..0000000 --- a/Python Notes/10. Chapter 10/04_constructor.py +++ /dev/null @@ -1,23 +0,0 @@ -# A very basic sample class -class Employee: - center = "Not known" - def __init__(self, name, marks, center): - self.name = name - self.marks = marks - self.center = center - - - def printObj(self): - print(f"The name is {self.name}") - print(f"The marks is {self.marks}") - print(f"The center is {self.center}") - - @staticmethod - def greet(): - print("good day") - - -harry = Employee("Harry", 34, "Delhi") -rohan = Employee("Rohan", 94, "Kolkata") -harry.printObj() -rohan.printObj() \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/05_pr01.py b/Python Notes/10. Chapter 10/05_pr01.py deleted file mode 100644 index 43e6d6f..0000000 --- a/Python Notes/10. Chapter 10/05_pr01.py +++ /dev/null @@ -1,10 +0,0 @@ -class Programmer: - def __init__(self, name, language): - self.name = name - self.language = language - -harry = Programmer("Harry", "Python") -rohan = Programmer("Rohan", "Java") - -print(rohan.name) -print(harry.name) \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/06_pr02.py b/Python Notes/10. Chapter 10/06_pr02.py deleted file mode 100644 index 904b33d..0000000 --- a/Python Notes/10. Chapter 10/06_pr02.py +++ /dev/null @@ -1,20 +0,0 @@ - -import math -class Calculator: - def __init__(self, number): - self.number = number - - def square(self): - return self.number * self.number - - def squareRoot(self): - return math.sqrt(self.number) - - def cube(self): - return self.number * self.number * self.number - -two = Calculator(2) -print(two.number) -print(two.square()) -print(two.cube()) -print(two.squareRoot()) \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/07_pr03.py b/Python Notes/10. Chapter 10/07_pr03.py deleted file mode 100644 index fdd2e2f..0000000 --- a/Python Notes/10. Chapter 10/07_pr03.py +++ /dev/null @@ -1,8 +0,0 @@ -class MyClass: - a = 9 - -obj = MyClass() -print(obj.a) -obj.a = 0 # I am setting an instance attribute by doing this! -print(obj.a) -print(MyClass.a) \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/08_pr05.py b/Python Notes/10. Chapter 10/08_pr05.py deleted file mode 100644 index 875b4df..0000000 --- a/Python Notes/10. Chapter 10/08_pr05.py +++ /dev/null @@ -1,20 +0,0 @@ -class Train: - - def __init__(self) -> None: - self.seats = 78 - self.fare = 175 - - def bookTicket(self): - self.seats -= 1 - - def getStatus(self): - print(self.seats) - - def getFareInfo(self): - print(self.fare) - -tr = Train() -tr.getFareInfo() -tr.getStatus() -tr.bookTicket() -tr.getStatus() \ No newline at end of file diff --git a/Python Notes/10. Chapter 10/Chapter 10 - Oops.pdf b/Python Notes/10. Chapter 10/Chapter 10 - Oops.pdf deleted file mode 100644 index fa6a05a..0000000 Binary files a/Python Notes/10. Chapter 10/Chapter 10 - Oops.pdf and /dev/null differ diff --git a/Python Notes/10. Chapter 10/Chapter 10 - Practice Set.pdf b/Python Notes/10. Chapter 10/Chapter 10 - Practice Set.pdf deleted file mode 100644 index 4211328..0000000 Binary files a/Python Notes/10. Chapter 10/Chapter 10 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/11. Chapter 11/01_child.py b/Python Notes/11. Chapter 11/01_child.py deleted file mode 100644 index 26533c5..0000000 --- a/Python Notes/11. Chapter 11/01_child.py +++ /dev/null @@ -1,14 +0,0 @@ -class Employee: - a = 34 - - -class Programmer(Employee): - b = 32 - -pr = Programmer() -print(pr.a) -print(pr.b) - -em = Employee() -print(em.a) -# print(em.b) # This line throws an error \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/02_multiple.py b/Python Notes/11. Chapter 11/02_multiple.py deleted file mode 100644 index c2762d9..0000000 --- a/Python Notes/11. Chapter 11/02_multiple.py +++ /dev/null @@ -1,13 +0,0 @@ -class Parent1: - a = 4 - -class Parent2: - b = 2 - -class Child(Parent1, Parent2): - c = 9 - -ch = Child() -print(ch.a) -print(ch.b) -print(ch.c) diff --git a/Python Notes/11. Chapter 11/03_multilevel.py b/Python Notes/11. Chapter 11/03_multilevel.py deleted file mode 100644 index f151eab..0000000 --- a/Python Notes/11. Chapter 11/03_multilevel.py +++ /dev/null @@ -1,13 +0,0 @@ -class Parent: - a = 4 - -class Child1(Parent): - b = 2 - -class Child2(Child1): - c = 9 - -ch = Child2() -print(ch.a) -print(ch.b) -print(ch.c) diff --git a/Python Notes/11. Chapter 11/04_super.py b/Python Notes/11. Chapter 11/04_super.py deleted file mode 100644 index 46847bf..0000000 --- a/Python Notes/11. Chapter 11/04_super.py +++ /dev/null @@ -1,21 +0,0 @@ -class Parent: - a = 4 - def __init__(self) -> None: - print("Parent") - -class Child1(Parent): - b = 2 - def __init__(self) -> None: - print("Child1") - super().__init__() - -class Child2(Child1): - c = 9 - def __init__(self) -> None: - super().__init__() - print("Child2") - -ch = Child2() -print(ch.a) -print(ch.b) -print(ch.c) diff --git a/Python Notes/11. Chapter 11/05_classmethod.py b/Python Notes/11. Chapter 11/05_classmethod.py deleted file mode 100644 index ca942d1..0000000 --- a/Python Notes/11. Chapter 11/05_classmethod.py +++ /dev/null @@ -1,18 +0,0 @@ -class Employee: - a = 10 - b = 4 - c = 6 - @classmethod - def setAttrs(cls, a, b, c): - cls.a = a - cls.b = b - cls.c = c - -emp = Employee() -print(Employee.a) -print(Employee.b) -print(Employee.c) -emp.setAttrs(1, 2, 3) -print(Employee.a) -print(Employee.b) -print(Employee.c) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/06_property.py b/Python Notes/11. Chapter 11/06_property.py deleted file mode 100644 index d281ffa..0000000 --- a/Python Notes/11. Chapter 11/06_property.py +++ /dev/null @@ -1,23 +0,0 @@ -class Employee: - a = 10 - b = 4 - c = 6 - @classmethod - def setAttrs(cls, a, b, c): - cls.a = a - cls.b = b - cls.c = c - - @property - def length(self): - return self.a - - @length.setter - def length(self, value): - self.a = value - -emp = Employee() -emp.setAttrs(1, 2, 3) -print(emp.length) -emp.length = 78 -print(emp.length) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/07_dundermethods.py b/Python Notes/11. Chapter 11/07_dundermethods.py deleted file mode 100644 index 3faf9de..0000000 --- a/Python Notes/11. Chapter 11/07_dundermethods.py +++ /dev/null @@ -1,20 +0,0 @@ -class Employee: - def __init__(self, a, name) -> None: - self.a = a - self.name = name - - def __add__(self, obj): - return self.a + obj.a - - def __str__(self) -> str: - return self.name - - def __len__(self): - return self.a - -a = Employee(45, "Harry") -b = Employee(40, "Rohan") - -print(a, b) -print(len(a)) -print(len(b)) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/08_pr01.py b/Python Notes/11. Chapter 11/08_pr01.py deleted file mode 100644 index e53b0bc..0000000 --- a/Python Notes/11. Chapter 11/08_pr01.py +++ /dev/null @@ -1,21 +0,0 @@ -class Vector2d: - def __init__(self, i, j) -> None: - self.i = i - self.j = j - - def printVector(self): - print(f"{self.i}i + {self.j}j") - -class Vector3d(Vector2d): - def __init__(self, i, j, k): - super().__init__(i, j) - self.k = k - - def printVector(self): - print(f"{self.i}i + {self.j}j + {self.k}k") - -v2 = Vector2d(1, 5) -v3 = Vector3d(11, 5, 9) - -v2.printVector() -v3.printVector() \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/09_pr03.py b/Python Notes/11. Chapter 11/09_pr03.py deleted file mode 100644 index d6c2ffd..0000000 --- a/Python Notes/11. Chapter 11/09_pr03.py +++ /dev/null @@ -1,19 +0,0 @@ -class Employee: - def __init__(self, salary, increment) -> None: - self.salary = salary - self.increment = increment - - @property - def salaryAfterIncrement(self): - return self.salary * (1+self.increment) - - @salaryAfterIncrement.setter - def salaryAfterIncrement(self): - self.salary = self.salary * (1+self.increment) - - -emp1 = Employee(10000, 0.1) -print(emp1.salaryAfterIncrement) -emp1.salaryAfterIncrement = 11000 - - \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/10_pr04.py b/Python Notes/11. Chapter 11/10_pr04.py deleted file mode 100644 index d43909d..0000000 --- a/Python Notes/11. Chapter 11/10_pr04.py +++ /dev/null @@ -1,13 +0,0 @@ -class Complex: - def __init__(self,a, b) -> None: - self.a = a - self.b = b - - def __add__(self, obj): - return Complex(self.a + obj.a, self.b + obj.b) - - -c1 = Complex(1, 4) -c2 = Complex(11, 3) -c3 = c1+c2 -print(c3.a, c3.b) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/11_pr06.py b/Python Notes/11. Chapter 11/11_pr06.py deleted file mode 100644 index 747d030..0000000 --- a/Python Notes/11. Chapter 11/11_pr06.py +++ /dev/null @@ -1,20 +0,0 @@ -class Vector2d: - def __init__(self, i, j) -> None: - self.i = i - self.j = j - - def printVector(self): - print(f"{self.i}i + {self.j}j") - -class Vector3d(Vector2d): - def __init__(self, i, j, k): - super().__init__(i, j) - self.k = k - - - def __str__(self) -> str: - return f"{self.i}i + {self.j}j + {self.k}k" - - -v3 = Vector3d(11, 5, 9) -print(v3) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/12_pr05.py b/Python Notes/11. Chapter 11/12_pr05.py deleted file mode 100644 index 97c78cb..0000000 --- a/Python Notes/11. Chapter 11/12_pr05.py +++ /dev/null @@ -1,25 +0,0 @@ -class Vector: - def __init__(self, l1) -> None: - self.data = l1 - - def __add__(self, obj): - myList = [] - for i in range(len(obj.data)): - myList.append(obj.data[i] + self.data[i]) - return Vector(myList) - - def __mul__(self, obj): - dot = 0 - for i in range(len(obj.data)): - dot += (obj.data[i] * self.data[i]) - return dot - def __len__(self): - return len(self.data) - -v1 = Vector([1, 2, 3]) -v2 = Vector([11, 12, 13]) -v3 = v1 + v2 -v4 = v1*v2 # v4 is a scalar -print(v3.data) -print(v4) -print(len(v3)) \ No newline at end of file diff --git a/Python Notes/11. Chapter 11/Chapter 11 - Practice Set.pdf b/Python Notes/11. Chapter 11/Chapter 11 - Practice Set.pdf deleted file mode 100644 index ed49623..0000000 Binary files a/Python Notes/11. Chapter 11/Chapter 11 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/11. Chapter 11/Chapter 11.pdf b/Python Notes/11. Chapter 11/Chapter 11.pdf deleted file mode 100644 index 18c6aa6..0000000 Binary files a/Python Notes/11. Chapter 11/Chapter 11.pdf and /dev/null differ diff --git a/Python Notes/12. Chapter 12/01_try_except.py b/Python Notes/12. Chapter 12/01_try_except.py deleted file mode 100644 index ee42550..0000000 --- a/Python Notes/12. Chapter 12/01_try_except.py +++ /dev/null @@ -1,18 +0,0 @@ -try: - print("Hello world") - a = int(input("Enter a number: ")) - b = int(input("Enter another number: ")) - print(a / b) - if b>199: - raise Exception("This number is too large") - -except ValueError: - print("Value error occurred") -except ZeroDivisionError: - print("This is a zero division error") -except Exception as e: - print(f"This problem occurred: {e}") -else: - print("Try was successful") - -print("There were no errors") \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/03_name_main.py b/Python Notes/12. Chapter 12/03_name_main.py deleted file mode 100644 index 210a034..0000000 --- a/Python Notes/12. Chapter 12/03_name_main.py +++ /dev/null @@ -1,5 +0,0 @@ -import a02_finally - - - - diff --git a/Python Notes/12. Chapter 12/04_global.py b/Python Notes/12. Chapter 12/04_global.py deleted file mode 100644 index e403b1a..0000000 --- a/Python Notes/12. Chapter 12/04_global.py +++ /dev/null @@ -1,11 +0,0 @@ -a = 9 -def func(): - global a - a = 8 - print(a) - a = 900 - print(a) - -print(a) -func() -print(a) \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/05_enumerate.py b/Python Notes/12. Chapter 12/05_enumerate.py deleted file mode 100644 index 856bb4a..0000000 --- a/Python Notes/12. Chapter 12/05_enumerate.py +++ /dev/null @@ -1,8 +0,0 @@ -a = [1, 4, 6, 'apple'] -# i = 0 -# for item in a: -# i = i + 1 -# print(f"Item number {i} is {item}") - -for i, item in enumerate(a): - print(f"Item number {i+1} is {item}") \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/06_listComp.py b/Python Notes/12. Chapter 12/06_listComp.py deleted file mode 100644 index 77e4ffa..0000000 --- a/Python Notes/12. Chapter 12/06_listComp.py +++ /dev/null @@ -1,8 +0,0 @@ -l1 = [1, 2, 3, 4, 5, 6] - -# l2 =[] -# for item in l1: -# l2.append(item*item) - -l2 = [i*i for i in l1 if i>2] -print(l2) \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/07_pr01.py b/Python Notes/12. Chapter 12/07_pr01.py deleted file mode 100644 index c89eea4..0000000 --- a/Python Notes/12. Chapter 12/07_pr01.py +++ /dev/null @@ -1,12 +0,0 @@ -try: - with open('1.txt', 'r') as f: - f.read() - with open('2.txt', 'r') as f: - f.read() - with open('3.txt', 'r') as f: - f.read() - -except Exception as e: - print(f"The file is not present. Reason: {e}") - -print("Thanks for using this program") \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/08_pr02.py b/Python Notes/12. Chapter 12/08_pr02.py deleted file mode 100644 index 62615df..0000000 --- a/Python Notes/12. Chapter 12/08_pr02.py +++ /dev/null @@ -1,6 +0,0 @@ -list1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] - -for index, item in enumerate(list1): - if(index+1 == 3 or index+1 == 5 or index+1 == 7): - print(item) - diff --git a/Python Notes/12. Chapter 12/09_pr03.py b/Python Notes/12. Chapter 12/09_pr03.py deleted file mode 100644 index f45d8f7..0000000 --- a/Python Notes/12. Chapter 12/09_pr03.py +++ /dev/null @@ -1,4 +0,0 @@ -num = int(input("Enter a number: ")) - -multiplication = [i*num for i in range(1, 11)] -print(multiplication) \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/10_pr05.py b/Python Notes/12. Chapter 12/10_pr05.py deleted file mode 100644 index 6d0527c..0000000 --- a/Python Notes/12. Chapter 12/10_pr05.py +++ /dev/null @@ -1,7 +0,0 @@ -num = int(input("Enter a number: ")) - -multiplication = [i*num for i in range(1, 11)] -print(multiplication) - -with open('mul.txt', 'w') as f: - f.write(str(multiplication)) \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/11_pr04.py b/Python Notes/12. Chapter 12/11_pr04.py deleted file mode 100644 index aecb893..0000000 --- a/Python Notes/12. Chapter 12/11_pr04.py +++ /dev/null @@ -1,15 +0,0 @@ -try: - print("Hello world") - a = int(input("Enter a number: ")) - b = int(input("Enter another number: ")) - c = a/b - - -except ValueError: - print("Value error occurred") -except ZeroDivisionError: - c = "Infinite" -except Exception as e: - print(f"This problem occurred: {e}") - -print(c) \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/Chapter 12 - Advanced Python 1.pdf b/Python Notes/12. Chapter 12/Chapter 12 - Advanced Python 1.pdf deleted file mode 100644 index a2d08a3..0000000 Binary files a/Python Notes/12. Chapter 12/Chapter 12 - Advanced Python 1.pdf and /dev/null differ diff --git a/Python Notes/12. Chapter 12/Chapter 12 - Practice Set.pdf b/Python Notes/12. Chapter 12/Chapter 12 - Practice Set.pdf deleted file mode 100644 index c77a5e9..0000000 Binary files a/Python Notes/12. Chapter 12/Chapter 12 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/12. Chapter 12/__pycache__/a02_finally.cpython-39.pyc b/Python Notes/12. Chapter 12/__pycache__/a02_finally.cpython-39.pyc deleted file mode 100644 index e557fa9..0000000 Binary files a/Python Notes/12. Chapter 12/__pycache__/a02_finally.cpython-39.pyc and /dev/null differ diff --git a/Python Notes/12. Chapter 12/a02_finally.py b/Python Notes/12. Chapter 12/a02_finally.py deleted file mode 100644 index 00e292d..0000000 --- a/Python Notes/12. Chapter 12/a02_finally.py +++ /dev/null @@ -1,17 +0,0 @@ -def function(): - try: - a = int(input("Enter a number: ")) - b = int(input("Enter another number: ")) - print(a / b) - return a/b - except Exception as e: - print(f"This problem occurred: {e}") - return 0 - finally: - print("I will always be executed") - # print("I will always be executed") - -print(__name__) -if __name__ == '__main__': - function() - print("main") \ No newline at end of file diff --git a/Python Notes/12. Chapter 12/mul.txt b/Python Notes/12. Chapter 12/mul.txt deleted file mode 100644 index c191bf4..0000000 --- a/Python Notes/12. Chapter 12/mul.txt +++ /dev/null @@ -1 +0,0 @@ -[5, 10, 15, 20, 25, 30, 35, 40, 45, 50] \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/01_venv.py b/Python Notes/13. Chapter 13/01_venv.py deleted file mode 100644 index e187194..0000000 --- a/Python Notes/13. Chapter 13/01_venv.py +++ /dev/null @@ -1,2 +0,0 @@ -import pandas -print("Hello world") \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/02_lambda.py b/Python Notes/13. Chapter 13/02_lambda.py deleted file mode 100644 index 1546ba7..0000000 --- a/Python Notes/13. Chapter 13/02_lambda.py +++ /dev/null @@ -1,7 +0,0 @@ -# def square(n): -# return n*n - -square = lambda x: x*x -divide = lambda x, y: x/y -print(square(4)) -print(divide(4, 2)) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/03_join.py b/Python Notes/13. Chapter 13/03_join.py deleted file mode 100644 index 27745c9..0000000 --- a/Python Notes/13. Chapter 13/03_join.py +++ /dev/null @@ -1,4 +0,0 @@ -friends = ['Rohit', 'Shubh', 'Preeti', 'Neha', 'Disha'] - -a = " is a friend of ".join(friends) -print(a) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/04_format.py b/Python Notes/13. Chapter 13/04_format.py deleted file mode 100644 index 5a1e49f..0000000 --- a/Python Notes/13. Chapter 13/04_format.py +++ /dev/null @@ -1,2 +0,0 @@ -a = "I am a good boy on {1} and a friend of {0}".format('Earth', 'Harry') -print(a) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/05_mfr.py b/Python Notes/13. Chapter 13/05_mfr.py deleted file mode 100644 index e314726..0000000 --- a/Python Notes/13. Chapter 13/05_mfr.py +++ /dev/null @@ -1,19 +0,0 @@ -from functools import reduce - -# Demonstration for map -square = lambda x: x*x -l = [1,2,3,4, 5] -c = map(square, l) -print(list(c)) - -# Demonstration for filter -greater = lambda x: x>4 -a = [1, 2, 3, 4, 54,67, 81, 8, 89 ] -d = filter(greater, a) -print(list(d)) - -# Demonstration for reduce -sum = lambda x, y: x+y -a = [1, 2, 3, 7] -d = reduce(sum, a) -print(d) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/06_pr02.py b/Python Notes/13. Chapter 13/06_pr02.py deleted file mode 100644 index b9055ec..0000000 --- a/Python Notes/13. Chapter 13/06_pr02.py +++ /dev/null @@ -1,3 +0,0 @@ -st = "The name of the student is {}, his marks are {} and phone number is {}" -a = st.format("Harry", 34, 9888888800) -print(a) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/07_pr03.py b/Python Notes/13. Chapter 13/07_pr03.py deleted file mode 100644 index 7e92edc..0000000 --- a/Python Notes/13. Chapter 13/07_pr03.py +++ /dev/null @@ -1,6 +0,0 @@ -a = [i*7 for i in range(1, 11)] -st = "" -for item in a: - st += str(item) + '\n' - -print(st) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/08_pr04.py b/Python Notes/13. Chapter 13/08_pr04.py deleted file mode 100644 index 74e27bc..0000000 --- a/Python Notes/13. Chapter 13/08_pr04.py +++ /dev/null @@ -1,7 +0,0 @@ -def is_divisible(n): - if n%5 ==0: - return True - return False - -a = [1,2,3,4,5,60,7,8,9,10] -print(list(filter(is_divisible, a))) diff --git a/Python Notes/13. Chapter 13/09_pr05.py b/Python Notes/13. Chapter 13/09_pr05.py deleted file mode 100644 index 10f02a3..0000000 --- a/Python Notes/13. Chapter 13/09_pr05.py +++ /dev/null @@ -1,10 +0,0 @@ -from functools import reduce - -def max(m, n): - if m>n: - return m - return n - -a = [1111,2,3,54,675,54,34] -maxNum = reduce(max, a) -print(maxNum) \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/10_pr06.py b/Python Notes/13. Chapter 13/10_pr06.py deleted file mode 100644 index 9775ae3..0000000 --- a/Python Notes/13. Chapter 13/10_pr06.py +++ /dev/null @@ -1,9 +0,0 @@ -from flask import Flask - -app = Flask(__name__) - -@app.route("/") -def hello_world(): - return "

Hello, World2!

" - -app.run() \ No newline at end of file diff --git a/Python Notes/13. Chapter 13/Chapter 13 - Advanced Python 2.pdf b/Python Notes/13. Chapter 13/Chapter 13 - Advanced Python 2.pdf deleted file mode 100644 index ffb463b..0000000 Binary files a/Python Notes/13. Chapter 13/Chapter 13 - Advanced Python 2.pdf and /dev/null differ diff --git a/Python Notes/13. Chapter 13/Chapter 13 - Practice Set.pdf b/Python Notes/13. Chapter 13/Chapter 13 - Practice Set.pdf deleted file mode 100644 index 8a17f09..0000000 Binary files a/Python Notes/13. Chapter 13/Chapter 13 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/13. Chapter 13/requirements.txt b/Python Notes/13. Chapter 13/requirements.txt deleted file mode 100644 index 09c9819..0000000 Binary files a/Python Notes/13. Chapter 13/requirements.txt and /dev/null differ diff --git a/Python Notes/2. Chapter 2/.vscode/settings.json b/Python Notes/2. Chapter 2/.vscode/settings.json deleted file mode 100644 index dd7992b..0000000 --- a/Python Notes/2. Chapter 2/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.pythonPath": "C:\\Python\\python.exe" -} \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/01_variables.py b/Python Notes/2. Chapter 2/01_variables.py deleted file mode 100644 index 0e326c7..0000000 --- a/Python Notes/2. Chapter 2/01_variables.py +++ /dev/null @@ -1,9 +0,0 @@ -a = 34 -c = 56.23 -e = "A Duck" -print(a) -print(e) -print(c) -d = None -print(d) -i5k5 = 34 \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/02_operators.py b/Python Notes/2. Chapter 2/02_operators.py deleted file mode 100644 index e8dc43a..0000000 --- a/Python Notes/2. Chapter 2/02_operators.py +++ /dev/null @@ -1,38 +0,0 @@ -a = 7 -b = 3 - -# Arithmetic Operators in Python -print("a + b = ", a + b) -print("a - b = ", a - b) -print("a * b = ", a * b) -print("a / b = ", a / b) - -# Assignment Operators in Python -print("Demonstrating Assignment Operators in Python") -c = 5 -d = 7 - -print(c, d) -c += 5 -d += 1 -print(c, d) - - -# Comparison Operators in Python -print("Demonstrating Comparison Operators in Python") -e = 6 -f = 9 - -print(e==f) -print(e>f) -print(ef) -print(e==f or ef)) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/03_type.py b/Python Notes/2. Chapter 2/03_type.py deleted file mode 100644 index 62ea553..0000000 --- a/Python Notes/2. Chapter 2/03_type.py +++ /dev/null @@ -1,15 +0,0 @@ -a = "This is a" -b = 34 -c = None -d = False - -print(a) -print(b) -print(c) -print(d) - -print(type(a)) -print(type(b)) -print(type(c)) -print(type(d)) - diff --git a/Python Notes/2. Chapter 2/04_typecasting.py b/Python Notes/2. Chapter 2/04_typecasting.py deleted file mode 100644 index 87b5ecc..0000000 --- a/Python Notes/2. Chapter 2/04_typecasting.py +++ /dev/null @@ -1,15 +0,0 @@ -a = 56 -b = "56y" -c = int(b) - -print(a) -print(b) -print(c) - -print(a==b) -print(a==c) -print(b==c) - -print(type(a)) -print(type(b)) -print(type(c)) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/05_input.py b/Python Notes/2. Chapter 2/05_input.py deleted file mode 100644 index f758dae..0000000 --- a/Python Notes/2. Chapter 2/05_input.py +++ /dev/null @@ -1,7 +0,0 @@ -# a = input("Enter your name: ") -# print("Your name is:", a) - -a = input("Enter first number: ") -b = input("Enter second number: ") - -print("The sum is:", int(a) + int(b)) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/06_practice01.py b/Python Notes/2. Chapter 2/06_practice01.py deleted file mode 100644 index ba898e8..0000000 --- a/Python Notes/2. Chapter 2/06_practice01.py +++ /dev/null @@ -1,4 +0,0 @@ -a = int(input("Enter the first Number: ")) -b = int(input("Enter the second Number: ")) - -print("The sum of these two numbers is:", a+b) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/07_practice02.py b/Python Notes/2. Chapter 2/07_practice02.py deleted file mode 100644 index d6dccd8..0000000 --- a/Python Notes/2. Chapter 2/07_practice02.py +++ /dev/null @@ -1,2 +0,0 @@ -number = int(input("Enter the number: ")) -print("Remainder when the number is divided by 2 is:", number%2) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/08_practice03.py b/Python Notes/2. Chapter 2/08_practice03.py deleted file mode 100644 index 94905eb..0000000 --- a/Python Notes/2. Chapter 2/08_practice03.py +++ /dev/null @@ -1,2 +0,0 @@ -a = input("Enter something: ") -print("The type of a is:", type(a)) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/09_practice04.py b/Python Notes/2. Chapter 2/09_practice04.py deleted file mode 100644 index 36e3367..0000000 --- a/Python Notes/2. Chapter 2/09_practice04.py +++ /dev/null @@ -1,4 +0,0 @@ -a = 346 -b = 80 - -print("a is greater than b is:", a>b) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/10_practice10.py b/Python Notes/2. Chapter 2/10_practice10.py deleted file mode 100644 index 8c0f9e5..0000000 --- a/Python Notes/2. Chapter 2/10_practice10.py +++ /dev/null @@ -1,2 +0,0 @@ -a = int(input("Enter the number: ")) -print("The square of this number is:", a *a) \ No newline at end of file diff --git a/Python Notes/2. Chapter 2/Chapter 2 - Practice.pdf b/Python Notes/2. Chapter 2/Chapter 2 - Practice.pdf deleted file mode 100644 index 8ea0a04..0000000 Binary files a/Python Notes/2. Chapter 2/Chapter 2 - Practice.pdf and /dev/null differ diff --git a/Python Notes/2. Chapter 2/Chapter 2.pdf b/Python Notes/2. Chapter 2/Chapter 2.pdf deleted file mode 100644 index 1ce0bc0..0000000 Binary files a/Python Notes/2. Chapter 2/Chapter 2.pdf and /dev/null differ diff --git a/Python Notes/3. Chapter 3/.vscode/settings.json b/Python Notes/3. Chapter 3/.vscode/settings.json deleted file mode 100644 index dd7992b..0000000 --- a/Python Notes/3. Chapter 3/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.pythonPath": "C:\\Python\\python.exe" -} \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/01_string.py b/Python Notes/3. Chapter 3/01_string.py deleted file mode 100644 index 893c98c..0000000 --- a/Python Notes/3. Chapter 3/01_string.py +++ /dev/null @@ -1,23 +0,0 @@ -name = "Adam D'Angelo" -name2 = 'Joh"n' -name3 = '''Twinkle, twinkle, little star -How I wonder what you are -Up above the world so high -Like "a diamond in the sky -Twinkle, twinkle little star' -How I wonder what you are -When the blazing sun is gone -When he nothing shines upon -Then you show your little light -Twinkle, twinkle, all the night -Twinkle, twinkle, little star -How I wonder what you are''' - -print(name) -print(type(name)) - -print(name2) -print(type(name2)) - -print(name3) -print(type(name3)) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/02_slicing.py b/Python Notes/3. Chapter 3/02_slicing.py deleted file mode 100644 index 9bd6b22..0000000 --- a/Python Notes/3. Chapter 3/02_slicing.py +++ /dev/null @@ -1,5 +0,0 @@ -name = "Harry" -print(name) - -print(name[4]) -print(name[1:4]) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/03_skip_value.py b/Python Notes/3. Chapter 3/03_skip_value.py deleted file mode 100644 index dda9a3e..0000000 --- a/Python Notes/3. Chapter 3/03_skip_value.py +++ /dev/null @@ -1,5 +0,0 @@ -myStr = "abcdefghijklmnopqrstuvwxyz" - -print(myStr[2:6]) -print(myStr[1:9]) -print(myStr[1:9:3]) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/04_string_functions.py b/Python Notes/3. Chapter 3/04_string_functions.py deleted file mode 100644 index 49ab6e6..0000000 --- a/Python Notes/3. Chapter 3/04_string_functions.py +++ /dev/null @@ -1,11 +0,0 @@ -myStr = "abcdefghijklmnopqrstuvwxyzaaab" - -print(len(myStr)) -print(myStr.endswith("xyz")) -print(myStr.startswith("abcd")) -print(myStr.count('ab')) - -myStr = "my name is harry name" -print(myStr.capitalize()) -print(myStr.find("name")) -print(myStr.replace("name", "date")) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/05_escape_sequences.py b/Python Notes/3. Chapter 3/05_escape_sequences.py deleted file mode 100644 index c545dd8..0000000 --- a/Python Notes/3. Chapter 3/05_escape_sequences.py +++ /dev/null @@ -1,2 +0,0 @@ -myName = "My Name\nis \tHar\"ry" -print(myName) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/06_practice1.py b/Python Notes/3. Chapter 3/06_practice1.py deleted file mode 100644 index 006cbfa..0000000 --- a/Python Notes/3. Chapter 3/06_practice1.py +++ /dev/null @@ -1,2 +0,0 @@ -name = input("Enter your name: ") -print("Good afternoon " + name) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/07_practice2.py b/Python Notes/3. Chapter 3/07_practice2.py deleted file mode 100644 index e90f83d..0000000 --- a/Python Notes/3. Chapter 3/07_practice2.py +++ /dev/null @@ -1,10 +0,0 @@ -name = input("Enter the name: ") -date = input("Enter the date: ") - -template = ''' -Dear <|name|>, -you are selected -<|date|> -''' - -print(template.replace('<|name|>', name).replace('<|date|>', date)) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/08_practice3.py b/Python Notes/3. Chapter 3/08_practice3.py deleted file mode 100644 index 1f39a36..0000000 --- a/Python Notes/3. Chapter 3/08_practice3.py +++ /dev/null @@ -1,4 +0,0 @@ -myStr = "This is me and I am a good boy" - -print(myStr.find(" ")) -print(myStr.find("harry")) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/09_practice4.py b/Python Notes/3. Chapter 3/09_practice4.py deleted file mode 100644 index 8645345..0000000 --- a/Python Notes/3. Chapter 3/09_practice4.py +++ /dev/null @@ -1,3 +0,0 @@ -myStr = "This is me and I am a good boy" - -print(myStr.replace(" ", " ")) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/10_practice5.py b/Python Notes/3. Chapter 3/10_practice5.py deleted file mode 100644 index ffda4dd..0000000 --- a/Python Notes/3. Chapter 3/10_practice5.py +++ /dev/null @@ -1,2 +0,0 @@ -letter = "Dear Harry,\n\tThis python course is nice.\nThanks" -print(letter) \ No newline at end of file diff --git a/Python Notes/3. Chapter 3/Chapter 3 Practice Set.pdf b/Python Notes/3. Chapter 3/Chapter 3 Practice Set.pdf deleted file mode 100644 index 4258060..0000000 Binary files a/Python Notes/3. Chapter 3/Chapter 3 Practice Set.pdf and /dev/null differ diff --git a/Python Notes/3. Chapter 3/Chapter 3.pdf b/Python Notes/3. Chapter 3/Chapter 3.pdf deleted file mode 100644 index dddc238..0000000 Binary files a/Python Notes/3. Chapter 3/Chapter 3.pdf and /dev/null differ diff --git a/Python Notes/4. Chapter 4/01_list.py b/Python Notes/4. Chapter 4/01_list.py deleted file mode 100644 index d2398ec..0000000 --- a/Python Notes/4. Chapter 4/01_list.py +++ /dev/null @@ -1,7 +0,0 @@ -a = 12 -b = "This is a string" -c = False - -myList = [a, b , c, 23.2] -print(myList) -print(type(myList)) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/02_list_slicing.py b/Python Notes/4. Chapter 4/02_list_slicing.py deleted file mode 100644 index 8c85d94..0000000 --- a/Python Notes/4. Chapter 4/02_list_slicing.py +++ /dev/null @@ -1,4 +0,0 @@ -l1 = [7, 9 , "Harry"] -print(l1[0:3]) -print(l1[0:4]) -print(l1[0:40]) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/03_list_methods.py b/Python Notes/4. Chapter 4/03_list_methods.py deleted file mode 100644 index f9360f2..0000000 --- a/Python Notes/4. Chapter 4/03_list_methods.py +++ /dev/null @@ -1,10 +0,0 @@ -myListOfNumbers = [1, 8, 7, 2, 21, 15] -print(myListOfNumbers) -# myListOfNumbers.sort() # Sorts the original list -# myListOfNumbers.reverse() # Reverses the original list -# myListOfNumbers.append(9) # Add 9 at the end of the original list -# myListOfNumbers.insert(2, 9) # Inserts 9 at index 2 -# myListOfNumbers.pop() # Removes an item from the end of the list -# myListOfNumbers.pop(2) # Removes an item from the given index from the list -myListOfNumbers.remove(21) # Removes the first occurence of a given item from the list -print(myListOfNumbers) diff --git a/Python Notes/4. Chapter 4/04_tuples.py b/Python Notes/4. Chapter 4/04_tuples.py deleted file mode 100644 index 62a1863..0000000 --- a/Python Notes/4. Chapter 4/04_tuples.py +++ /dev/null @@ -1,5 +0,0 @@ -# myTuple = (3, 6, 7) -myTuple = (4,) -print(myTuple) -# myTuple[0] = 8 # This will throw an error -print(type(myTuple)) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/05_tuple_methods.py b/Python Notes/4. Chapter 4/05_tuple_methods.py deleted file mode 100644 index afd4cd4..0000000 --- a/Python Notes/4. Chapter 4/05_tuple_methods.py +++ /dev/null @@ -1,3 +0,0 @@ -a = (1, 7, 12, 2, 2) -# print(a.count(1)) -print(a.index(2)) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/06_pr01.py b/Python Notes/4. Chapter 4/06_pr01.py deleted file mode 100644 index 824ec6d..0000000 --- a/Python Notes/4. Chapter 4/06_pr01.py +++ /dev/null @@ -1,7 +0,0 @@ -f1 = input("Enter fruit 1: ") -f2 = input("Enter fruit 2: ") -f3 = input("Enter fruit 3: ") -f4 = input("Enter fruit 4: ") - -fruitList = [f1, f2, f3, f4] -print(fruitList) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/07_pr02.py b/Python Notes/4. Chapter 4/07_pr02.py deleted file mode 100644 index 785cc45..0000000 --- a/Python Notes/4. Chapter 4/07_pr02.py +++ /dev/null @@ -1,10 +0,0 @@ -marks1 = int(input("Enter marks of student 1: ")) -marks2 = int(input("Enter marks of student 2: ")) -marks3 = int(input("Enter marks of student 3: ")) -marks4 = int(input("Enter marks of student 4: ")) -marks5 = int(input("Enter marks of student 5: ")) -marks6 = int(input("Enter marks of student 6: ")) - -marksList = [marks1, marks2, marks3, marks4, marks5, marks6] -marksList.sort() -print(marksList) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/08_pr04.py b/Python Notes/4. Chapter 4/08_pr04.py deleted file mode 100644 index 363e86e..0000000 --- a/Python Notes/4. Chapter 4/08_pr04.py +++ /dev/null @@ -1,7 +0,0 @@ -myList = [1, 2, 4, 5] -sum = 0 -sum += myList[0] -sum += myList[1] -sum += myList[2] -sum += myList[3] -print("The value of sum is", sum) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/09_pr05.py b/Python Notes/4. Chapter 4/09_pr05.py deleted file mode 100644 index 2f31bf5..0000000 --- a/Python Notes/4. Chapter 4/09_pr05.py +++ /dev/null @@ -1,2 +0,0 @@ -tu = (7, 0, 8, 0, 0, 9) -print("The number of zeros in this tuple is", tu.count(0)) \ No newline at end of file diff --git a/Python Notes/4. Chapter 4/Chapter 4 - Practice Set.pdf b/Python Notes/4. Chapter 4/Chapter 4 - Practice Set.pdf deleted file mode 100644 index d40b24c..0000000 Binary files a/Python Notes/4. Chapter 4/Chapter 4 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/4. Chapter 4/Chapter 4.pdf b/Python Notes/4. Chapter 4/Chapter 4.pdf deleted file mode 100644 index e100bd7..0000000 Binary files a/Python Notes/4. Chapter 4/Chapter 4.pdf and /dev/null differ diff --git a/Python Notes/5. Chapter 5/01_dict.py b/Python Notes/5. Chapter 5/01_dict.py deleted file mode 100644 index 7cdec20..0000000 --- a/Python Notes/5. Chapter 5/01_dict.py +++ /dev/null @@ -1,13 +0,0 @@ -oxford = { - "gift": "Something willingly given to someone to appreciate", - "this": "A keyword in c++", - "Youtube": "A video sharing platform", - "instagram": "a picture sharing platform", - "mylist": [1, 3, 45] -} - - -# print(oxford) -print(oxford['this']) -# print(oxford['notpresent']) -print(oxford.get('notpresent')) \ No newline at end of file diff --git a/Python Notes/5. Chapter 5/02_dictmethods.py b/Python Notes/5. Chapter 5/02_dictmethods.py deleted file mode 100644 index 217cf6f..0000000 --- a/Python Notes/5. Chapter 5/02_dictmethods.py +++ /dev/null @@ -1,15 +0,0 @@ -oxford = { - "gift": "Something willingly given to someone to appreciate", - "this": "A keyword in c++", - "Youtube": "A video sharing platform", - "instagram": "a picture sharing platform", - "mylist": [1, 3, 45] -} - -oxford.update({"harry":"Good boy", "mylist": [56, 8]}) -# print(oxford.items()) -for a, b in oxford.items(): - print(a,":=", b) - -# for key in oxford.keys(): -# print(key) \ No newline at end of file diff --git a/Python Notes/5. Chapter 5/03_sets.py b/Python Notes/5. Chapter 5/03_sets.py deleted file mode 100644 index 9c933e4..0000000 --- a/Python Notes/5. Chapter 5/03_sets.py +++ /dev/null @@ -1,9 +0,0 @@ -mySet = {1, 34, 53} -mySet.add(45) -mySet.add("1") -print(mySet) -mySet.remove(34) -mySet.add("1") -print(mySet.pop()) -print(mySet) -print(len(mySet)) \ No newline at end of file diff --git a/Python Notes/5. Chapter 5/04_pr01.py b/Python Notes/5. Chapter 5/04_pr01.py deleted file mode 100644 index 3785a93..0000000 --- a/Python Notes/5. Chapter 5/04_pr01.py +++ /dev/null @@ -1,10 +0,0 @@ -oxford = { - "lakdi": "wood", - "kursi": "chair", - "chaku": "knife" -} -key = input("Enter the key\n") -if(oxford.get(key)== None): - print("Value not found") -else: - print("The value corresponding to your key is:", oxford.get(key)) \ No newline at end of file diff --git a/Python Notes/5. Chapter 5/05_pr02.py b/Python Notes/5. Chapter 5/05_pr02.py deleted file mode 100644 index 01e4479..0000000 --- a/Python Notes/5. Chapter 5/05_pr02.py +++ /dev/null @@ -1,13 +0,0 @@ -s = set() -# for i in range(8): -s.add(18) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) -s.add(input("Enter your number: ")) - -print(s) \ No newline at end of file diff --git a/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.docx b/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.docx deleted file mode 100644 index 94936a5..0000000 Binary files a/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.docx and /dev/null differ diff --git a/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.pdf b/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.pdf deleted file mode 100644 index c38a549..0000000 Binary files a/Python Notes/5. Chapter 5/Chapter 5 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/5. Chapter 5/Chapter 5.docx b/Python Notes/5. Chapter 5/Chapter 5.docx deleted file mode 100644 index a7b8c4b..0000000 Binary files a/Python Notes/5. Chapter 5/Chapter 5.docx and /dev/null differ diff --git a/Python Notes/5. Chapter 5/Chapter 5.pdf b/Python Notes/5. Chapter 5/Chapter 5.pdf deleted file mode 100644 index 5e65df9..0000000 Binary files a/Python Notes/5. Chapter 5/Chapter 5.pdf and /dev/null differ diff --git a/Python Notes/6. Chapter 6/01_ifelifelse.py b/Python Notes/6. Chapter 6/01_ifelifelse.py deleted file mode 100644 index 5069ac7..0000000 --- a/Python Notes/6. Chapter 6/01_ifelifelse.py +++ /dev/null @@ -1,9 +0,0 @@ -a = 30 -if(a>4): - print("a is greater than 4") - -if(a>2): - print("a is greater than 2") -else: - print("nothing") - diff --git a/Python Notes/6. Chapter 6/02_quiz.py b/Python Notes/6. Chapter 6/02_quiz.py deleted file mode 100644 index 1d8c7fb..0000000 --- a/Python Notes/6. Chapter 6/02_quiz.py +++ /dev/null @@ -1,6 +0,0 @@ -age = int(input("Enter your age: ")) -if(age>=18): - print("Yes") - -else: - print("No") \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/03_relational_operators.py b/Python Notes/6. Chapter 6/03_relational_operators.py deleted file mode 100644 index 2bf673d..0000000 --- a/Python Notes/6. Chapter 6/03_relational_operators.py +++ /dev/null @@ -1,5 +0,0 @@ -a = 435 -b = 64 - -print(a>5) -print(b>=164) \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/04_logical_operators.py b/Python Notes/6. Chapter 6/04_logical_operators.py deleted file mode 100644 index 4c13f63..0000000 --- a/Python Notes/6. Chapter 6/04_logical_operators.py +++ /dev/null @@ -1,7 +0,0 @@ -a = True -b = False - -print(a and b) - -print( a or b) -print(not(a)) \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/05_pr_01.py b/Python Notes/6. Chapter 6/05_pr_01.py deleted file mode 100644 index 8745e6d..0000000 --- a/Python Notes/6. Chapter 6/05_pr_01.py +++ /dev/null @@ -1,21 +0,0 @@ -a = 457 -b = 6 -c = 86 -d = 23 - -if(a>b): - maxNum1 = a -else: - maxNum1 = b - -if(c>d): - maxNum2 = c -else: - maxNum2 = d - -if(maxNum2>maxNum1): - maxNum = maxNum2 -else: - maxNum = maxNum1 - -print("Maximum number out of these four numbers is", maxNum) \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/06_pr_02.py b/Python Notes/6. Chapter 6/06_pr_02.py deleted file mode 100644 index eec0954..0000000 --- a/Python Notes/6. Chapter 6/06_pr_02.py +++ /dev/null @@ -1,13 +0,0 @@ -m1 = int(input("Enter the marks for sub 1: ")) -m2 = int(input("Enter the marks for sub 2: ")) -m3 = int(input("Enter the marks for sub 3: ")) - -overAll = (m1+m2+m3)/3 - -if(overAll>=40): - if(m1>=33 and m2>=33 and m3>=33): - print("You have passed the exam") - else: - print("You have not passed the exam due to one of the subjects") -else: - print("You have not passed the exam due to overall percentage") \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/07_pr_03.py b/Python Notes/6. Chapter 6/07_pr_03.py deleted file mode 100644 index b6be267..0000000 --- a/Python Notes/6. Chapter 6/07_pr_03.py +++ /dev/null @@ -1,16 +0,0 @@ -spamWords = ['buy now', 'subscribe this', 'click this'] - -# email = "this is a nice stock. You need to click this and buy this stock" -email = input("Enter your email: ").lower() -spam = False - -if('buy now' in email): - spam = True - -if('subscribe this' in email): - spam = True - -if('click this' in email): - spam = True - -print("Spam is", spam) diff --git a/Python Notes/6. Chapter 6/08_pr_04.py b/Python Notes/6. Chapter 6/08_pr_04.py deleted file mode 100644 index 0e76635..0000000 --- a/Python Notes/6. Chapter 6/08_pr_04.py +++ /dev/null @@ -1,7 +0,0 @@ -name = 'Shubhi' -names = ['Harry', 'Shubham', 'Meena'] -if(name in names): - print('Name is present') - -else: - print("Name is not present") \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/09_pr_07.py b/Python Notes/6. Chapter 6/09_pr_07.py deleted file mode 100644 index 499fb9e..0000000 --- a/Python Notes/6. Chapter 6/09_pr_07.py +++ /dev/null @@ -1,5 +0,0 @@ -text = input("Enter your text: ") -if 'harry' in text.lower(): - print("Yes harry is present") -else: - print("No harry is not present") \ No newline at end of file diff --git a/Python Notes/6. Chapter 6/Chapter 6 - Practice Set.pdf b/Python Notes/6. Chapter 6/Chapter 6 - Practice Set.pdf deleted file mode 100644 index b25ac89..0000000 Binary files a/Python Notes/6. Chapter 6/Chapter 6 - Practice Set.pdf and /dev/null differ diff --git a/Python Notes/6. Chapter 6/Chapter 6.pdf b/Python Notes/6. Chapter 6/Chapter 6.pdf deleted file mode 100644 index ca8cada..0000000 Binary files a/Python Notes/6. Chapter 6/Chapter 6.pdf and /dev/null differ diff --git a/Python Notes/7. Chapter 7/01_loops.py b/Python Notes/7. Chapter 7/01_loops.py deleted file mode 100644 index 2c319a9..0000000 --- a/Python Notes/7. Chapter 7/01_loops.py +++ /dev/null @@ -1,4 +0,0 @@ -a = 0 -while(a<100): - print(a) - a += 1 \ No newline at end of file diff --git a/Python Notes/7. Chapter 7/02_while.py b/Python Notes/7. Chapter 7/02_while.py deleted file mode 100644 index d883778..0000000 --- a/Python Notes/7. Chapter 7/02_while.py +++ /dev/null @@ -1,4 +0,0 @@ -i = 1 -while(i<=5): - print(i) - i += 1 \ No newline at end of file diff --git a/Python Notes/7. Chapter 7/03_infinite_while.py b/Python Notes/7. Chapter 7/03_infinite_while.py deleted file mode 100644 index d883778..0000000 --- a/Python Notes/7. Chapter 7/03_infinite_while.py +++ /dev/null @@ -1,4 +0,0 @@ -i = 1 -while(i<=5): - print(i) - i += 1 \ No newline at end of file diff --git a/Python Notes/7. Chapter 7/04_while_print_list.py b/Python Notes/7. Chapter 7/04_while_print_list.py deleted file mode 100644 index 4499a0a..0000000 --- a/Python Notes/7. Chapter 7/04_while_print_list.py +++ /dev/null @@ -1,5 +0,0 @@ -a = [1, "apple", 3, 4 , 5, "banana"] -i = 0 -while(inum2): - greater = num1 - else: - greater = num2 - if(num3>greater): - greater = num3 - - return greater - -a = greatest(333, 653, 21) -print(a) \ No newline at end of file diff --git a/Python Notes/8. Chapter 8/06_pr02.py b/Python Notes/8. Chapter 8/06_pr02.py deleted file mode 100644 index f1bbb10..0000000 --- a/Python Notes/8. Chapter 8/06_pr02.py +++ /dev/null @@ -1,5 +0,0 @@ -def cel2far(cel): - return (cel * 9/5) + 32 - -a = cel2far(137) -print(a) diff --git a/Python Notes/8. Chapter 8/07_pr03.py b/Python Notes/8. Chapter 8/07_pr03.py deleted file mode 100644 index aa820ec..0000000 --- a/Python Notes/8. Chapter 8/07_pr03.py +++ /dev/null @@ -1,2 +0,0 @@ -print("Harry and Raj", end="") -print("and Simran", end="") \ No newline at end of file diff --git a/Python Notes/8. Chapter 8/08_pr04.py b/Python Notes/8. Chapter 8/08_pr04.py deleted file mode 100644 index 2014dd9..0000000 --- a/Python Notes/8. Chapter 8/08_pr04.py +++ /dev/null @@ -1,9 +0,0 @@ -# Sum(8) = 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 -# Sum(n) = Sum(n-1) + n -def sum(n): - if(n == 1): - return 1 - return sum(n-1) + n - -a = sum(5) -print(a) diff --git a/Python Notes/8. Chapter 8/09_pr05.py b/Python Notes/8. Chapter 8/09_pr05.py deleted file mode 100644 index bc03a9c..0000000 --- a/Python Notes/8. Chapter 8/09_pr05.py +++ /dev/null @@ -1,5 +0,0 @@ -def printPattern(n): - for i in range(n): - print("*"*(n-i)) - -printPattern(3) diff --git a/Python Notes/8. Chapter 8/10_pr07.py b/Python Notes/8. Chapter 8/10_pr07.py deleted file mode 100644 index 089d38c..0000000 --- a/Python Notes/8. Chapter 8/10_pr07.py +++ /dev/null @@ -1,9 +0,0 @@ -def process(l, word): - word = word.strip() - if word in l: - l.remove(word) - return l1 - -l1 = ['harry', 'rohan', 'akash', 'shubham', 'lovish'] -l1 = process(l1, ' rohan ') -print(l1) \ No newline at end of file diff --git a/Python Notes/8. Chapter 8/Chapter 8 Practice Set.pdf b/Python Notes/8. Chapter 8/Chapter 8 Practice Set.pdf deleted file mode 100644 index 8ccbe8e..0000000 Binary files a/Python Notes/8. Chapter 8/Chapter 8 Practice Set.pdf and /dev/null differ diff --git a/Python Notes/8. Chapter 8/Chapter 8.pdf b/Python Notes/8. Chapter 8/Chapter 8.pdf deleted file mode 100644 index 8961dc2..0000000 Binary files a/Python Notes/8. Chapter 8/Chapter 8.pdf and /dev/null differ diff --git a/Python Notes/9. Chapter 9/01_file_read.py b/Python Notes/9. Chapter 9/01_file_read.py deleted file mode 100644 index c46fb13..0000000 --- a/Python Notes/9. Chapter 9/01_file_read.py +++ /dev/null @@ -1,14 +0,0 @@ -f = open("this.txt", "r") -# text = f.read(6) - -# text = f.readline() -# print(text) -# text = f.readline() -# print(text) -# text = f.readline() -# print(text) - -textList = f.readlines() -print(textList) - -f.close() \ No newline at end of file diff --git a/Python Notes/9. Chapter 9/02_file_write.py b/Python Notes/9. Chapter 9/02_file_write.py deleted file mode 100644 index 03b7869..0000000 --- a/Python Notes/9. Chapter 9/02_file_write.py +++ /dev/null @@ -1,4 +0,0 @@ -f = open("write.txt", "w") -f.write("This is a text, I want to write to this file\n") -f.write("Second line: This is a text, I want to write to this file") -f.close() \ No newline at end of file diff --git a/Python Notes/9. Chapter 9/03_file_append.py b/Python Notes/9. Chapter 9/03_file_append.py deleted file mode 100644 index af39fc3..0000000 --- a/Python Notes/9. Chapter 9/03_file_append.py +++ /dev/null @@ -1,5 +0,0 @@ -f = open("write.txt", "w") # Write mode -f = open("write.txt", "a") # Append mode -f.write("This is a text, I want to write to this file\n") -f.write("Second line: This is a text, I want to write to this file") -f.close() \ No newline at end of file diff --git a/Python Notes/9. Chapter 9/04_with.py b/Python Notes/9. Chapter 9/04_with.py deleted file mode 100644 index 23688c2..0000000 --- a/Python Notes/9. Chapter 9/04_with.py +++ /dev/null @@ -1,2 +0,0 @@ -with open("mine.txt", "w") as f: - f.write("This file is mine") \ No newline at end of file diff --git a/Python Notes/9. Chapter 9/05_pr01.py b/Python Notes/9. Chapter 9/05_pr01.py deleted file mode 100644 index a9a593d..0000000 --- a/Python Notes/9. Chapter 9/05_pr01.py +++ /dev/null @@ -1,5 +0,0 @@ -with open("poems.txt", "r") as f: - if('twinkle' in f.read()): - print("Yes twinkle is present") - else: - print("The word twinkle is not present") \ No newline at end of file diff --git a/Python Notes/9. Chapter 9/06_pr02.py b/Python Notes/9. Chapter 9/06_pr02.py deleted file mode 100644 index fcff16f..0000000 --- a/Python Notes/9. Chapter 9/06_pr02.py +++ /dev/null @@ -1,17 +0,0 @@ -import random - -def game(): - score = random.randint(1, 100) - print(f"The score is {score}") - return score - -score = game() -with open("hiscore.txt", "r") as f: - hiscore = int(f.read()) - -if hiscorenumber): - guess = int(input("Guess another number. This one is too big: ")) - attempt += 1 - elif(guess str: - return f"{self.name} - {self.email}" \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/home/tests.py b/Python Notes/Project 3/portfolio/home/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/Python Notes/Project 3/portfolio/home/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/Python Notes/Project 3/portfolio/home/urls.py b/Python Notes/Project 3/portfolio/home/urls.py deleted file mode 100644 index fafff2d..0000000 --- a/Python Notes/Project 3/portfolio/home/urls.py +++ /dev/null @@ -1,24 +0,0 @@ -"""portfolio URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/3.2/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path('', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) -""" -from django.contrib import admin -from django.urls import path, include -from home import views - -urlpatterns = [ - path('', views.home, name='home'), - path('about', views.about, name='about'), - path('contact', views.contact, name='contact'), -] diff --git a/Python Notes/Project 3/portfolio/home/views.py b/Python Notes/Project 3/portfolio/home/views.py deleted file mode 100644 index cae154d..0000000 --- a/Python Notes/Project 3/portfolio/home/views.py +++ /dev/null @@ -1,23 +0,0 @@ -from django.http.response import HttpResponse -from django.shortcuts import render, HttpResponse -from home.models import Contact - -# Create your views here. -def home(request): - return render(request, 'index.html') - -def about(request): - # return HttpResponse('about') - return render(request, 'about.html') - -def contact(request): - # Handle the form here - if request.method == 'POST': - name = request.POST['name'] - phone = request.POST['phone'] - email = request.POST['email'] - desc = request.POST['desc'] - c = Contact(name=name, phone=phone, email=email, desc=desc) - c.save() - - return render(request, 'contact.html') \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/manage.py b/Python Notes/Project 3/portfolio/manage.py deleted file mode 100644 index c0cc6b1..0000000 --- a/Python Notes/Project 3/portfolio/manage.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -"""Django's command-line utility for administrative tasks.""" -import os -import sys - - -def main(): - """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'portfolio.settings') - try: - from django.core.management import execute_from_command_line - except ImportError as exc: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) from exc - execute_from_command_line(sys.argv) - - -if __name__ == '__main__': - main() diff --git a/Python Notes/Project 3/portfolio/portfolio/__init__.py b/Python Notes/Project 3/portfolio/portfolio/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/Python Notes/Project 3/portfolio/portfolio/__pycache__/__init__.cpython-39.pyc b/Python Notes/Project 3/portfolio/portfolio/__pycache__/__init__.cpython-39.pyc deleted file mode 100644 index 0cb3b8f..0000000 Binary files a/Python Notes/Project 3/portfolio/portfolio/__pycache__/__init__.cpython-39.pyc and /dev/null differ diff --git a/Python Notes/Project 3/portfolio/portfolio/__pycache__/settings.cpython-39.pyc b/Python Notes/Project 3/portfolio/portfolio/__pycache__/settings.cpython-39.pyc deleted file mode 100644 index 301db39..0000000 Binary files a/Python Notes/Project 3/portfolio/portfolio/__pycache__/settings.cpython-39.pyc and /dev/null differ diff --git a/Python Notes/Project 3/portfolio/portfolio/__pycache__/urls.cpython-39.pyc b/Python Notes/Project 3/portfolio/portfolio/__pycache__/urls.cpython-39.pyc deleted file mode 100644 index 01997be..0000000 Binary files a/Python Notes/Project 3/portfolio/portfolio/__pycache__/urls.cpython-39.pyc and /dev/null differ diff --git a/Python Notes/Project 3/portfolio/portfolio/__pycache__/wsgi.cpython-39.pyc b/Python Notes/Project 3/portfolio/portfolio/__pycache__/wsgi.cpython-39.pyc deleted file mode 100644 index 3369b23..0000000 Binary files a/Python Notes/Project 3/portfolio/portfolio/__pycache__/wsgi.cpython-39.pyc and /dev/null differ diff --git a/Python Notes/Project 3/portfolio/portfolio/asgi.py b/Python Notes/Project 3/portfolio/portfolio/asgi.py deleted file mode 100644 index 76a3559..0000000 --- a/Python Notes/Project 3/portfolio/portfolio/asgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -ASGI config for portfolio project. - -It exposes the ASGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ -""" - -import os - -from django.core.asgi import get_asgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'portfolio.settings') - -application = get_asgi_application() diff --git a/Python Notes/Project 3/portfolio/portfolio/settings.py b/Python Notes/Project 3/portfolio/portfolio/settings.py deleted file mode 100644 index 5b52bb6..0000000 --- a/Python Notes/Project 3/portfolio/portfolio/settings.py +++ /dev/null @@ -1,130 +0,0 @@ -""" -Django settings for portfolio project. - -Generated by 'django-admin startproject' using Django 3.2.5. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.2/ref/settings/ -""" - -from pathlib import Path - -# Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-c6nsrya&0o=l2dm4yb0j@+yo6jr@mv=-$78t67us=qz^f*%11s' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'home.apps.HomeConfig', - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'portfolio.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': ['templates'], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'portfolio.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/3.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - -# Password validation -# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/3.2/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.2/howto/static-files/ - -STATIC_URL = '/static/' - -# Default primary key field type -# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field - -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' - -STATICFILES_DIRS = [ - "static", -] \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/portfolio/urls.py b/Python Notes/Project 3/portfolio/portfolio/urls.py deleted file mode 100644 index 33e965f..0000000 --- a/Python Notes/Project 3/portfolio/portfolio/urls.py +++ /dev/null @@ -1,26 +0,0 @@ -"""portfolio URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/3.2/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path('', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) -""" -from django.contrib import admin -from django.urls import path, include - -urlpatterns = [ - path('admin/', admin.site.urls), - path('', include('home.urls')) -] - -admin.site.site_header = "ProgrammingWithHarry Admin" -admin.site.site_title = "PWH Admin Portal" -admin.site.index_title = "Welcome to PWH Portal" \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/portfolio/wsgi.py b/Python Notes/Project 3/portfolio/portfolio/wsgi.py deleted file mode 100644 index 27bf431..0000000 --- a/Python Notes/Project 3/portfolio/portfolio/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for portfolio project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'portfolio.settings') - -application = get_wsgi_application() diff --git a/Python Notes/Project 3/portfolio/static/1.txt b/Python Notes/Project 3/portfolio/static/1.txt deleted file mode 100644 index 21e64d5..0000000 --- a/Python Notes/Project 3/portfolio/static/1.txt +++ /dev/null @@ -1 +0,0 @@ -this is a file \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/templates/about.html b/Python Notes/Project 3/portfolio/templates/about.html deleted file mode 100644 index aa53257..0000000 --- a/Python Notes/Project 3/portfolio/templates/about.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends 'base.html' %} -{% block body %} -{% endblock body %} \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/templates/base.html b/Python Notes/Project 3/portfolio/templates/base.html deleted file mode 100644 index 28658ed..0000000 --- a/Python Notes/Project 3/portfolio/templates/base.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - Contact - Harry's Portfolio - - -{% load static %} - - -{% block body %}{% endblock body%} - - - - - - - - - - \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/templates/contact.html b/Python Notes/Project 3/portfolio/templates/contact.html deleted file mode 100644 index 9794ed8..0000000 --- a/Python Notes/Project 3/portfolio/templates/contact.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends 'base.html' %} -{% block body %} - -
-

Contact Me

-
- {% csrf_token %} -
- - - -
-
- - -
We'll never share your email with anyone else. - -
-
-
- - -
-
- - -
- - -
-
- -{% endblock body %} \ No newline at end of file diff --git a/Python Notes/Project 3/portfolio/templates/delete.py b/Python Notes/Project 3/portfolio/templates/delete.py deleted file mode 100644 index e8c32f7..0000000 --- a/Python Notes/Project 3/portfolio/templates/delete.py +++ /dev/null @@ -1,13 +0,0 @@ -n = int (input("Enter a number")) -for i in range(1, n): - # print(n-i, i) - for j in range(n-i): - print(" ", end="") - - for k in range(2*i-1): - print("*", end="") - - for l in range(n-i): - print(" ", end="") - - print("\n", end="") diff --git a/Python Notes/Project 3/portfolio/templates/index.html b/Python Notes/Project 3/portfolio/templates/index.html deleted file mode 100644 index 267a80f..0000000 --- a/Python Notes/Project 3/portfolio/templates/index.html +++ /dev/null @@ -1,44 +0,0 @@ -{% extends 'base.html' %} -{% block body %} - -
-
-
-

- -

-
-
- This is the first item's accordion body. It is shown by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the .accordion-body, though the transition does limit overflow. -
-
-
-
-

- -

-
-
- This is the second item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the .accordion-body, though the transition does limit overflow. -
-
-
-
-

- -

-
-
- This is the third item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions. You can modify any of this with custom CSS or overriding our default variables. It's also worth noting that just about any HTML can go within the .accordion-body, though the transition does limit overflow. -
-
-
-
-
-{% endblock body %} \ No newline at end of file diff --git a/matplotlib/matplot1.py b/matplotlib/matplot1.py new file mode 100644 index 0000000..b9f1c1f --- /dev/null +++ b/matplotlib/matplot1.py @@ -0,0 +1 @@ +import matplotlib as plt diff --git a/numpy/numpy1.py b/numpy/numpy1.py new file mode 100644 index 0000000..08a7c92 --- /dev/null +++ b/numpy/numpy1.py @@ -0,0 +1,26 @@ +# Program to create a 1-D array to 4-D array +import numpy as np + +arr = np.array([(1,2,3,4)]) + +print('1-D array') +print(arr) +print('Dimension: ', arr.ndim) + +arr1 = np.array([(1,2,3,4), (2,3,4,5)]) + +print('\n2-D array') +print(arr1) +print('Dimension: ', arr1.ndim) + +arr2 = np.array([[(1,2,3), (1,4,5), (6,7,8)]]) + +print('\n3-D array') +print(arr2) +print('Dimension: ', arr2.ndim) + +arr3 = np.array([[[[1,2,3],[4,5,6],[7,8,9],[3,2,1]]]]) + +print('\n4-D array') +print(arr3) +print('Dimension: ', arr3.ndim) \ No newline at end of file diff --git a/numpy/numpy2.py b/numpy/numpy2.py new file mode 100644 index 0000000..0980bd9 --- /dev/null +++ b/numpy/numpy2.py @@ -0,0 +1,15 @@ +# program for performing different-2 operations +import numpy as np + +a = np.array([[1,2,3,4], [3,4,5,6]]) + +b = np.array([[1,2,3,5],[3,4,5,6]]) + +c = a*b +print('Multiplication of each element with next array element') +print(c) + + +d = np.add(a, b) +print('\nAddition of the element of arrays') +print(d) \ No newline at end of file diff --git a/numpy/numpy3.py b/numpy/numpy3.py new file mode 100644 index 0000000..f402b87 --- /dev/null +++ b/numpy/numpy3.py @@ -0,0 +1,15 @@ +# program for slicing of an array +import numpy as np + +a1 = np.array([[1,2,3,4,5],[4,5,6,7,8]]) + +for i in range(5): + print('col'+str(i+1)) + print(a1[0:, i]) + print('\n') + +print('\nrow1') +print(a1[0, 0:]) + +print('\nrow2') +print(a1[1, 0:]) diff --git a/numpy/numpy4.py b/numpy/numpy4.py new file mode 100644 index 0000000..d7f28b2 --- /dev/null +++ b/numpy/numpy4.py @@ -0,0 +1,14 @@ +import numpy as np +import time +import sys + +s = range(100000) + +print(sys.getsizeof(5)*len(s)) + +d = np.arange(100000) + +a = np.array([1,2,3,4,5]) +print(a) + +print(d.size*d.itemsize) \ No newline at end of file diff --git a/numpy/numpy5.py b/numpy/numpy5.py new file mode 100644 index 0000000..1790898 --- /dev/null +++ b/numpy/numpy5.py @@ -0,0 +1,15 @@ +import numpy as np + +a = np.array([(1,2,3,4,5,6)]) + +print('Size of the item in the array') +print(a.itemsize) + +print('Dimension of the array') +print(a.ndim) + +print('Data type of the item defined in the array') +print(a.dtype) + +print('Size and shape of the array') +print(a.size, ' ', a.shape) \ No newline at end of file diff --git a/numpy/numpy6.py b/numpy/numpy6.py new file mode 100644 index 0000000..05f336c --- /dev/null +++ b/numpy/numpy6.py @@ -0,0 +1,14 @@ +# reshape the matrix +import numpy as np + +a = np.array([(1,2,3), (4,5,6)]) + +print('Array is ', a) + +print('Reshaped array') +a = a.reshape(3,2) +print(a) + +print('Array after applying line space') +b = np.linspace(1,3,10) +print(b) \ No newline at end of file diff --git a/numpy/numpy7.py b/numpy/numpy7.py new file mode 100644 index 0000000..fa5c8a0 --- /dev/null +++ b/numpy/numpy7.py @@ -0,0 +1,44 @@ +# performing some operation upon the array +import numpy as np + +a = np.array([(10,30,50,2,3,70)]) + +print('Max value in the array is: ', a.max()) + +print('Min value in the array is: ', a.min()) + +print('Sum of the array is: ', a.sum()) + +a1 = np.array([(1,2,3,4),(7,8,9,1)]) +print('Sum of row') +print(a1.sum(axis=0)) + +print('Square root ') +print(np.sqrt(a1)) + +print('Standard deviation') +print(np.std(a1)) + +a2 = np.array([(1,2,3), (3,4,5)]) +a3 = np.array([(5,6,7), (1,2,3)]) + +print('sum is') +print(a2+a3) + +print('Subtraction is') +print(a2-a3) + +print('Multiplication is') +print(a2*a3) + +print('Division is') +print(a2/a3) + +print('Vertical stack') +print(np.vstack((a2,a3))) + +print('Horizontal stack') +print(np.hstack((a2,a3))) + +print('Converting array in single column') +print(a2.ravel()) diff --git a/pandas/panda1.py b/pandas/panda1.py new file mode 100644 index 0000000..85e0a31 --- /dev/null +++ b/pandas/panda1.py @@ -0,0 +1,18 @@ +import pandas as pd +import numpy as np + +# Series in pandas +arr = np.array([10, 2, 3, 4, 5]) + +s = pd.Series(arr) + +print(s) + +s1 = pd.Series(arr, index = [i for i in range(1, len(arr)+1)]) + +print(s1) + +s2 = pd.Series(arr, index = ['a', 'b', 'c', 'd', 'e']) +print(s2[:3]) + +print(s2[1:3]) diff --git a/pandas/panda2.py b/pandas/panda2.py new file mode 100644 index 0000000..c56fdaa --- /dev/null +++ b/pandas/panda2.py @@ -0,0 +1,7 @@ +import pandas as pd + +data = pd.read_excel("F:\\SEM-4\\DATA SCIENCE\\LAB\\data.xlsx") + +dataframe1 = pd.DataFrame(data) + +print(dataframe1) \ No newline at end of file diff --git a/pandas/panda3.py b/pandas/panda3.py new file mode 100644 index 0000000..26fe58b --- /dev/null +++ b/pandas/panda3.py @@ -0,0 +1,9 @@ +import pandas as pd + +data = pd.read_excel("F:\\SEM-4\\DATA SCIENCE\\LAB\\data.xlsx") + +print(data.head()) + +print(data.tail()) + +print(data.to_string()) \ No newline at end of file diff --git a/pandas/panda4.py b/pandas/panda4.py new file mode 100644 index 0000000..f5b7485 --- /dev/null +++ b/pandas/panda4.py @@ -0,0 +1,9 @@ +import pandas as pd +import html5lib + +from bs4 import BeautifulSoup + +link = "C:\\Users\\Rupesh Kumar Dwivedi\\Desktop\\Document\\HTML\\table.html" + +data = pd.read_html(link) +print(data) \ No newline at end of file diff --git a/pandas/panda5.py b/pandas/panda5.py new file mode 100644 index 0000000..ff862f8 --- /dev/null +++ b/pandas/panda5.py @@ -0,0 +1,5 @@ +import pandas as pd + +data = pd.read_csv("F:\\SEM-4\\DATA SCIENCE\\LAB\\data.csv", '\t') + +print(data) \ No newline at end of file diff --git a/pandas/panda6.py b/pandas/panda6.py new file mode 100644 index 0000000..44de2dc --- /dev/null +++ b/pandas/panda6.py @@ -0,0 +1,8 @@ +# Creating DataFrames using list +import pandas as pd + +ls = [[1, 2, 3, 4, 5, 6], [6, 5, 4, 3, 2, 1], [10,20,30,40,50,60], [5,6,7,8,9,10]] + +df = pd.DataFrame(ls, columns=['a', 'b', 'c', 'd', 'e', 'f'], index=['R1', 'R2', 'R3', 'R4']) + +print(df) diff --git a/pandas/panda7.py b/pandas/panda7.py new file mode 100644 index 0000000..913ecc2 --- /dev/null +++ b/pandas/panda7.py @@ -0,0 +1,11 @@ +# creating DataFrames using dict +import pandas as pd + +data = { + 'Name':['Rupesh', 'Rohan', 'Rahul', 'Ram', 'Riya', 'Raju'], + 'Age':[20, 21, 22, 20, 19, 18] + } + +df = pd.DataFrame(data, index=['R1', 'R2', 'R3', 'R4', 'R5','R6']) + +print(df) \ No newline at end of file diff --git a/pandas/panda8.py b/pandas/panda8.py new file mode 100644 index 0000000..ebf32d2 --- /dev/null +++ b/pandas/panda8.py @@ -0,0 +1,17 @@ +import pandas as pd +# make an array +array = [2, 4, 6, 8, 10, 12] + +# create a series +series_obj = pd.Series(array) +print(series_obj) + +# convert series object into array +arr = series_obj.values +print('Original array:\n', arr) + +# reshaping series +reshaped_arr = arr.reshape(3, 2) + +# show +print('\nReshaped array:\n',reshaped_arr) diff --git a/pandas/panda9.py b/pandas/panda9.py new file mode 100644 index 0000000..28cb6f0 --- /dev/null +++ b/pandas/panda9.py @@ -0,0 +1,19 @@ +# import pandas library +import pandas as pd + +# make list of names +ls = ['Rupesh', 'Rohan', 'Rahul', 'Ram', 'Riya', 'Raju'] + + +# create a series +series_obj = pd.Series(ls) +print("Given Series:\n", series_obj) + +# convert series object into array +arr = series_obj.values + +# reshaping series +reshaped_arr = arr.reshape((2, 3)) +# show +print("\n\nAfter Reshaping: \n", reshaped_arr) + diff --git a/pandas/pandas10.py b/pandas/pandas10.py new file mode 100644 index 0000000..a22e794 --- /dev/null +++ b/pandas/pandas10.py @@ -0,0 +1,5 @@ +import pandas as pd + +data = pd.read_csv("F:\\SEM-4\\DATA SCIENCE\\LAB\\data.csv") + +data.to_excel("C:\\Users\\Rupesh Kumar Dwivedi\\Desktop\\Book1.xlsx", index= None) \ No newline at end of file