Merge branch 'develop'

.gitignore

@@ -55,6 +55,9 @@ target/
 
 #Markdown README
 _README.md
+<<<<<<< HEAD
+/.idea
+=======
 #Jupyter Notebook Checkpoints
 *.checkpoint.ipynb
 docs/.ipynb_checkpoints/
@@ -67,3 +70,4 @@ docs/.ipynb_checkpoints/
 
 
 
+>>>>>>> master

docs/Visualizing NBA Shots with py-Goldsberry.ipynb

@@ -1279,7 +1279,7 @@
     "            y_bin = _freedman_diaconis_bins(data[y])\n",
     "            hex_gridsize = int(np.mean([x_bin, y_bin]))\n",
     "\n",
-    "        ax.hexbin(x, y, gridsize=hex_gridsize, cmap=cmap, **kwargs)\n",
+    "        ax.hexbin(data[x], data[y], gridsize=hex_gridsize, cmap=cmap, **kwargs)\n",
     "\n",
     "    else:\n",
     "        raise ValueError(\"kind must be 'scatter', 'kde', or 'hex'.\")\n",

goldsberry/league/league.py

@@ -70,7 +70,7 @@ def lineups(self):
         return self._get_table_from_data(self._data_tables, 0)
 
 
-# Doubl Check Stem
+# Double Check Stem
 class playoff_picture(NbaDataProvider):
     def __init__(self, **kwargs):
         url_modifier = 'playoffpicture'
@@ -130,6 +130,22 @@ def __init__(self, **kwargs):
     def clutch_stats(self):
         return self._get_table_from_data(self._data_tables, 0)
 
+class player_stats_hustle(NbaDataProvider):
+    def __init__(self, **kwargs):
+        url_modifier = 'leaguehustlestatsplayer'
+        NbaDataProvider.__init__(self, url_modifier=url_modifier, default_params=p_league_leaders, **kwargs)
+
+    def hustle_stats(self):
+        return self._get_table_from_data(self._data_tables,0)
+
+
+class team_stats_hustle(NbaDataProvider):
+    def __init__(self, **kwargs):
+        url_modifier = 'leaguehustlestatsteam'
+        NbaDataProvider.__init__(self, url_modifier=url_modifier, default_params=p_league_leaders, **kwargs)
+
+    def hustle_stats(self):
+        return self._get_table_from_data(self._data_tables,0)
 
 # class transactions(BASE):
 #     _pull_url = "http://stats.nba.com/feeds/NBAPlayerTransactions-559107/json.js"

goldsberry/masterclass.py

@@ -11,7 +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',
@@ -52,7 +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)
@@ -71,8 +77,12 @@ def _get_nba_data(self, api_params):
 
     @staticmethod
     def _get_table_from_data(nba_table, table_id):
-        headers = nba_table['resultSets'][table_id]['headers']
-        values = nba_table['resultSets'][table_id]['rowSet']
+        try:
+            headers = nba_table['resultSets'][table_id]['headers']
+            values = nba_table['resultSets'][table_id]['rowSet']
+        except:
+            headers = nba_table['resultSet'][table_id]['headers']
+            values = nba_table['resultSet'][table_id]['rowSet']
         return [dict(zip(headers, value)) for value in values]
 
     def _set_class_data(self):

goldsberry/player/player.py

@@ -156,7 +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):