Merge pull request #18 from sserrata/starrify-header

Fix "Starrify authorization header in __repr__ overrides HTTPClient header"

Author: sserrata

pancloud/credentials.py

@@ -50,10 +50,18 @@ def __init__(self, **kwargs):
     def __repr__(self):
         for k in self.kwargs.get('headers', {}):
             if k.lower() == 'authorization':
-                self.kwargs['headers'][k] = '*' * 6
+                x = dict(self.kwargs['headers'].items())
+                x[k] = '*' * 6  # starrify token
+                return '{}({}, {})'.format(
+                    self.__class__.__name__,
+                    ', '.join('%s=%r' % (x, _) for x, _ in
+                              self.kwargs.items() if x != 'headers'),
+                    'headers=%r' % x
+                )
         return '{}({})'.format(
             self.__class__.__name__,
-            ', '.join('%s=%r' % x for x in self.kwargs.items())
+            ', '.join(
+                '%s=%r' % x for x in self.kwargs.items())
         )
 
     def attributes(self, **kwargs):  # pragma: no cover

pancloud/directorysync.py

@@ -51,10 +51,18 @@ def __init__(self, **kwargs):
     def __repr__(self):
         for k in self.kwargs.get('headers', {}):
             if k.lower() == 'authorization':
-                self.kwargs['headers'][k] = '*' * 6
+                x = dict(self.kwargs['headers'].items())
+                x[k] = '*' * 6  # starrify token
+                return '{}({}, {})'.format(
+                    self.__class__.__name__,
+                    ', '.join('%s=%r' % (x, _) for x, _ in
+                              self.kwargs.items() if x != 'headers'),
+                    'headers=%r' % x
+                )
         return '{}({})'.format(
             self.__class__.__name__,
-            ', '.join('%s=%r' % x for x in self.kwargs.items())
+            ', '.join(
+                '%s=%r' % x for x in self.kwargs.items())
         )
 
     def ack(self, channel_id=None, **kwargs):  # pragma: no cover

pancloud/event.py

@@ -96,10 +96,18 @@ def __init__(self, **kwargs):
     def __repr__(self):
         for k in self.kwargs.get('headers', {}):
             if k.lower() == 'authorization':
-                self.kwargs['headers'][k] = '*' * 6
+                x = dict(self.kwargs['headers'].items())
+                x[k] = '*' * 6  # starrify token
+                return '{}({}, {})'.format(
+                    self.__class__.__name__,
+                    ', '.join('%s=%r' % (x, _) for x, _ in
+                              self.kwargs.items() if x != 'headers'),
+                    'headers=%r' % x
+                )
         return '{}({})'.format(
             self.__class__.__name__,
-            ', '.join('%s=%r' % x for x in self.kwargs.items())
+            ', '.join(
+                '%s=%r' % x for x in self.kwargs.items())
         )
 
     def request(self, **kwargs):

pancloud/httpclient.py

@@ -50,10 +50,18 @@ def __init__(self, **kwargs):
     def __repr__(self):
         for k in self.kwargs.get('headers', {}):
             if k.lower() == 'authorization':
-                self.kwargs['headers'][k] = '*' * 6
+                x = dict(self.kwargs['headers'].items())
+                x[k] = '*' * 6  # starrify token
+                return '{}({}, {})'.format(
+                    self.__class__.__name__,
+                    ', '.join('%s=%r' % (x, _) for x, _ in
+                              self.kwargs.items() if x != 'headers'),
+                    'headers=%r' % x
+                )
         return '{}({})'.format(
             self.__class__.__name__,
-            ', '.join('%s=%r' % x for x in self.kwargs.items())
+            ', '.join(
+                '%s=%r' % x for x in self.kwargs.items())
         )
 
     def delete(self, query_id=None, **kwargs):  # pragma: no cover