Merge pull request googleapis#1 from PhoenixAlx/master

Add utils in setup.py
urshala · Apr 26, 2018 · 17c08a3 · 17c08a3
2 parents 2410e35 + edc97a8
commit 17c08a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/O365/connection.py b/O365/connection.py
@@ -182,12 +182,12 @@ def get_iana_tz(windows_tz):
 
     def get_windows_tz(self, iana_tz=None):
         """ Returns a valid windows TimeZone from a given pytz TimeZone (Iana/Olson Timezones)
-        Note: Windows Timezones are SHIT!.. no .. really THEY ARE HOLY FUCKING SHIT!
+        Note: Windows Timezones are SHIT!.. no .. really THEY ARE HOLY FUCKING SHIT!. I AGREE
         """
         iana_tz = iana_tz or self.timezone
         timezone = IANA_TO_WIN.get(iana_tz.zone if isinstance(iana_tz, tzinfo) else iana_tz)
         if timezone is None:
-            raise pytz.UnknownTimeZoneError("Can't find Iana TimeZone " + iana_tz)
+            raise pytz.UnknownTimeZoneError("Can't find Iana TimeZone " + iana_tz.zone)
 
         return timezone
 

diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@
       maintainer='Janscas',
       maintainer_email='janscas@users.noreply.github.com',
       url='https://github.com/janscas/py-o365',
-      packages=['O365'],
+      packages=['O365','O365.utils'],
       install_requires=['requests', 'oauthlib', 'requests_oauthlib', 'beautifulsoup4', 'stringcase', 'python-dateutil', 'tzlocal'],
       license='Apache 2.0',
       classifiers=CLASSIFIERS