chore: fixes for package nits

pavelfeldman · pavelfeldman · commit b8fc2d117644 · 2020-07-06T16:04:54.000-07:00
diff --git a/client.py b/client.py
@@ -14,11 +14,11 @@
 
 import asyncio
 
-from playwright_web import webkit
+from playwright_web import browser_types
 
 async def run():
     print('Launching browser...')
-    browser = await webkit.launch(headless=False)
+    browser = await browser_types['webkit'].launch(headless=False)
     print('Contexts in browser: %d' % len(browser.contexts))
     print('Creating context...')
     context = await browser.newContext(viewport=None)
diff --git a/playwright_web/__init__.py b/playwright_web/__init__.py
@@ -17,9 +17,11 @@
 chromium = playwright.chromium
 firefox = playwright.firefox
 webkit = playwright.webkit
+browser_types = playwright.browser_types
 
 __all__ = [
   'chromium',
   'firefox',
-  'webkit'
+  'webkit',
+  'browser_types'
 ]
diff --git a/playwright_web/playwright.py b/playwright_web/playwright.py
@@ -23,6 +23,7 @@
 from playwright_web.connection import Connection
 from playwright_web.object_factory import create_remote_object
 from playwright_web.browser_type import BrowserType
+from typing import Dict
 
 class Playwright:
   def __init__(self) -> None:
@@ -61,8 +62,9 @@ async def _sync_init(self):
       self._connection.wait_for_object_with_known_name('chromium'),
       self._connection.wait_for_object_with_known_name('firefox'),
       self._connection.wait_for_object_with_known_name('webkit'))
-    self.chromium = chromium
-    self.firefox = firefox
-    self.webkit = webkit
+    self.chromium: BrowserType = chromium
+    self.firefox: BrowserType = firefox
+    self.webkit: BrowserType = webkit
+    self.browser_types: Dict[str, BrowserType] = dict(chromium=self.chromium, firefox=self.firefox, webkit=self.webkit)
 
 playwright = Playwright()
diff --git a/setup.py b/setup.py
@@ -28,6 +28,9 @@
   url='https://github.com/Microsoft/playwright-python',
   packages=setuptools.find_packages(),
   include_package_data=True,
+  install_requires=[
+    'pyee',
+  ],
   classifiers=[
     'Programming Language :: Python :: 3',
     'License :: OSI Approved :: Apache Software License',
