merge conflicts

.gitignore

@@ -55,4 +55,19 @@ target/
 
 #Markdown README
 _README.md
+<<<<<<< HEAD
 /.idea
+=======
+#Jupyter Notebook Checkpoints
+*.checkpoint.ipynb
+docs/.ipynb_checkpoints/
+
+
+
+.idea/
+*.sublime-project
+*.sublime-workspace
+
+
+
+>>>>>>> master

goldsberry/game/game.py

@@ -26,18 +26,6 @@ def team_stats(self):
         return self._get_table_from_data(self._data_tables, 1)
 
 
-class boxscore_hustle(NbaDataProvider):
-    def __init__(self, gameid, **kwargs):
-        url_modifier = 'hustlestatsboxscore'
-        NbaDataProvider.__init__(self, url_modifier=url_modifier, GameID=gameid, **kwargs)
-
-    def player_stats(self):
-        return self._get_table_from_data(self._data_tables, 0)
-
-    def team_stats(self):
-        return self._get_table_from_data(self._data_tables, 1)
-
-
 class boxscore_miscellaneous(NbaDataProvider):
     def __init__(self, gameid, **kwargs):
         url_modifier = 'boxscoremiscv2'
@@ -143,24 +131,6 @@ def _available_video(self):
         return self._get_table_from_data(self._data_tables, 1)
 
 
-class win_probability(NbaDataProvider):
-    def __init__(self, gameid, **kwargs):
-        url_modifier = 'winprobabilitypbp'
-        NbaDataProvider.__init__(self, url_modifier=url_modifier, GameID=gameid, RunType='each+second', **kwargs)
-
-    def win_probability(self):
-        return self._get_table_from_data(self._data_tables, 0)
-
-
-class fan_duel_scores(NbaDataProvider):
-    def __init__(self, gameid, **kwargs):
-        url_modifier = 'infographicfanduelplayer'
-        NbaDataProvider.__init__(self, url_modifier=url_modifier, GameID=gameid, RunType='each+second', **kwargs)
-
-    def daily_fantasy(self):
-        return self._get_table_from_data(self._data_tables, 0)
-
-
 # Courtesy of [email protected]
 class GameIDs(NbaDataProvider):
     def __init__(self, **kwargs):

goldsberry/masterclass.py

@@ -11,6 +11,10 @@
 # This library is different between python 2 and 3. This negates the difference
 # noinspection PyCompatibility
 from urllib.parse import urljoin
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
 
 header_data = {
     'Accept-Encoding': 'gzip, deflate, sdch',
@@ -51,6 +55,10 @@ def get_parameter_items(self):
     @retrying.retry(stop_max_attempt_number=3, wait_fixed=1000,
                     retry_on_exception=lambda exception: isinstance(exception, _requests.ConnectionError))
     def _get_nba_data(self, api_params):
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
         pull_url = self.target_url
         self._response = _requests.get(pull_url, params=api_params,
                                        headers=header_data)

goldsberry/player/player.py

@@ -156,6 +156,10 @@ def __init__(self,  **kwargs):
 
     def players(self):
         return self._get_table_from_data(self._data_tables, 0)
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
 
 # BLOCKED BY NBA
 class shot_log(NbaDataProvider):