Fixed __initialized__ issue when using multiple Helpers. Working on Py3

Christopher Rabotin · Christopher Rabotin · commit f368efa540d0 · 2015-01-14T17:27:55.000Z
now.
diff --git a/influxdb/helper.py b/influxdb/helper.py
@@ -51,8 +51,8 @@ def __new__(cls, *args, **kwargs):
         '''
         Initializes class attributes for subsequent constructor calls.
         '''
-        if not SeriesHelper.__initialized__:
-            SeriesHelper.__initialized__ = True
+        if not cls.__initialized__:
+            cls.__initialized__ = True
             try:
                 _meta = getattr(cls, 'Meta')
             except AttributeError:
diff --git a/tests/influxdb/helper_test.py b/tests/influxdb/helper_test.py
@@ -65,3 +65,28 @@ def testSeveralSeriesNames(self):
         self.assertListEqual(rcvd, expectation, 'Invalid JSON body of time series returned from _json_body_ for several series names: {}.'.format(rcvd))
         TestSeriesHelper.MySeriesHelper._reset_()
         self.assertEqual(TestSeriesHelper.MySeriesHelper._json_body_(), [], 'Resetting helper did not empty datapoints.')
+
+    def testInvalidHelpers(self):
+        '''
+        Tests errors in invalid helpers.
+        '''
+        class MissingMeta(SeriesHelper):
+            pass
+        
+        class MissingClient(SeriesHelper):
+            class Meta:
+                series_name = 'events.stats.{server_name}'
+                fields = ['time', 'server_name']
+        
+        class MissingSeriesName(SeriesHelper):
+            class Meta:
+                client = TestSeriesHelper.client
+                fields = ['time', 'server_name']
+        
+        class MissingFields(SeriesHelper):
+            class Meta:
+                client = TestSeriesHelper.client
+                series_name = 'events.stats.{server_name}'
+        
+        for cls in [MissingMeta, MissingClient, MissingFields, MissingSeriesName]:
+            self.assertRaises(AttributeError, cls, **{'time': 159, 'server_name': 'us.east-1'})
