Merge branch 'master' into master

Author: alexnbferreira

O365/event.py

@@ -339,4 +339,35 @@ def addAttendee(self,address,name=None):
 				name = address[:address.index('@')]
 			self.json['Attendees'].append({'EmailAddress':{'Address':address,'Name':name}})
 
+	def setLocation(self,loc):
+		'''
+		Sets the event's location.
+
+		Arguments:
+		loc -- two options, you can send a dictionary in the format discribed here:
+		https://msdn.microsoft.com/en-us/office/office365/api/complex-types-for-mail-contacts-calendar#LocationBeta
+		this will allow you to set address, coordinates, displayname, location email
+		address, location uri, or any combination of the above. If you don't need that much
+		detail you can simply send a string and it will be set as the locations display
+		name. If you send something not a string or a dict, it will try to cast whatever
+		you send into a string and set that as the display name.
+		'''
+		if Location not in self.json:
+			self.json['Location'] = {"Address":null}
+
+		if isinstance(loc,dict):
+			self.json['Location'] = loc
+		else:
+			self.json['Location']['DisplayName'] = str(loc)
+
+	def getLocation(self):
+		'''
+		Get the current location, if one is set.
+		'''
+		if Location in self.json:
+			return self.json['Location']
+		return None
+		
+			
+
 #To the King!

O365/message.py

@@ -252,4 +252,4 @@ def setBodyHTML(self, val=None):
       except:
         self.json['Body'] = {}
 
-# To the King!
+# To the King!

examples/VehicleBookings/veh.py

@@ -1,5 +1,4 @@
 from O365 import *
-from printing import *
 import json
 
 
@@ -15,25 +14,25 @@
 		e = veh['email']
 		p = veh['password']
 
-		schedule = Schedule(e,p)
+		schedule = Schedule((e,p))
 		try:
 			result = schedule.getCalendars()
-			print 'Fetched calendars for',e,'was successful:',result
+			print('Fetched calendars for',e,'was successful:',result)
 		except:
-			print 'Login failed for',e
+			print('Login failed for',e)
 
 		bookings = []
 
 		for cal in schedule.calendars:
-			print 'attempting to fetch events for',e
+			print('attempting to fetch events for',e)
 			try:
 				result = cal.getEvents()
-				print 'Got events',result,'got',len(cal.events)
+				print('Got events',result,'got',len(cal.events))
 			except:
-				print 'failed to fetch events'
-			print 'attempting for event information'
+				print('failed to fetch events')
+			print('attempting for event information')
 			for event in cal.events:
-				print 'HERE!'
+				print('HERE!')
 				bookings.append(event.fullcalendarioJson())
 		json_outs[e] = bookings