Merge branch 'master' into bug_fixes

Author: Narcolapser

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+#python:
+#        - "2.7"
+#        - "3.4"
+#        - "3.5"
+#        - "3.6"
+#install:
+#        - pip install -r requirements.txt
+
+script: pytest
+         

O365/cal.py

@@ -40,6 +40,11 @@ def __init__(self, json=None, auth=None, verify=True):
 			self.name = json['Name']
 
 		self.verify = verify
+	
+	def __str__(self):
+		if self.json and 'Name' in self.json:
+			return self.json['Name']
+		return "Unnamed calendar"
 
 	def __str__(self):
 		'''Return informal, nicely printable string.'''

requirements.txt

@@ -0,0 +1,9 @@
+## Principle requirement for the entire library ##
+requests
+
+## Required to get OAuth to work                ##
+oauthlib
+requests_oauthlib
+
+## Used for the metaclass functionality         ##
+future

tests/test_attachment.py

@@ -4,7 +4,6 @@
 import base64
 from random import randint
 
-
 att_rep = open('attachment.json','r').read()
 att_j = json.loads(att_rep)