Fixed some typos throughout the codebase

alex · alex · commit 06160bcc0fec · 2014-05-10T11:06:21.000-07:00
diff --git a/conftest.py b/conftest.py
@@ -80,8 +80,8 @@ def __contains__(self, search):
     settings.SENTRY_TSDB = 'sentry.tsdb.redis.RedisTSDB'
     settings.SENTRY_TSDB_OPTIONS = {}
 
-    # django mail uses socket.getfqdn which doesnt play nice if our
-    # networking isnt stable
+    # django mail uses socket.getfqdn which doesn't play nice if our
+    # networking isn't stable
     patcher = mock.patch('socket.getfqdn', return_value='localhost')
     patcher.start()
 
diff --git a/docs/developer/client/index.rst b/docs/developer/client/index.rst
@@ -338,7 +338,7 @@ See :doc:`../interfaces/index` for information on Sentry's builtin interfaces an
 Authentication
 --------------
 
-An authentication header is expected to be sent along with the message body, which acts as as an ownership identifier::
+An authentication header is expected to be sent along with the message body, which acts as an ownership identifier::
 
     X-Sentry-Auth: Sentry sentry_version=5,
     sentry_client=<client version, arbitrary>,
diff --git a/docs/performance/index.rst b/docs/performance/index.rst
@@ -22,9 +22,9 @@ With that in mind, we recommend the following changes to (some) default configur
 Web Server
 ----------
 
-Switching off of the default Sentry worker model and to uWSGI + emporer mode can yield very good results.
+Switching off of the default Sentry worker model and to uWSGI + emperor mode can yield very good results.
 
-If you're using supervisord, you can easily implement emporer mode and uWSGI yourself by doing something along the lines of:
+If you're using supervisord, you can easily implement emperor mode and uWSGI yourself by doing something along the lines of:
 
 ::
 
@@ -101,7 +101,7 @@ Once you're running multiple processes, you'll of course need to also configure
 	  }
 	}
 
-See uWSGI's official documentation for emporer mode details.
+See uWSGI's official documentation for emperor mode details.
 
 
 Celery
diff --git a/docs/queue/index.rst b/docs/queue/index.rst
@@ -19,7 +19,7 @@ which is the worker manager process of the Celery library.
 
     sentry celery worker -B
 
-.. note:: You will need to run both celery workers and celerybeat. In our example, the -B flag runs a beat instance (in addition to the worker), but in production you may want to run them seperately.
+.. note:: You will need to run both celery workers and celerybeat. In our example, the -B flag runs a beat instance (in addition to the worker), but in production you may want to run them separately.
 
 We again recommend running this as a service. Below is an example configuration with supervisor:
 
diff --git a/docs/quickstart/index.rst b/docs/quickstart/index.rst
@@ -369,7 +369,7 @@ slightly better).
 Enabling Social Auth
 --------------------
 
-Most of the time it doesnt really matter **how** someone authenticates to the service, so much as it that they do. In
+Most of the time it doesn't really matter **how** someone authenticates to the service, so much as it that they do. In
 these cases, Sentry provides tight integrated with several large social services, including: Twitter, Facebook, Google,
 and GitHub. Enabling this is as simple as setting up an application with the respective services, and configuring a
 couple values in your ``sentry.conf.py`` file.
diff --git a/src/sentry/api/endpoints/group_details.py b/src/sentry/api/endpoints/group_details.py
@@ -17,7 +17,7 @@ def _get_activity(self, request, group, num=7):
         for item in activity_qs[:num * 2]:
             sig = (item.event_id, item.type, item.ident, item.user_id)
             # TODO: we could just generate a signature (hash(text)) for notes
-            # so theres no special casing
+            # so there's no special casing
             if item.type == Activity.NOTE:
                 activity.append(item)
             elif sig not in activity_items:
diff --git a/src/sentry/api/paginator.py b/src/sentry/api/paginator.py
@@ -85,10 +85,10 @@ def get_cursor(self, limit=100, cursor=None):
             results = [r for r in reversed(results[:limit + 1])]
             num_results = len(results)
         elif cursor_offset or offset:
-            # It's likely that theres a previous page if they passed us either offset values
+            # It's likely that there's a previous page if they passed us either offset values
             has_prev = True
         else:
-            # we dont know
+            # we don't know
             has_prev = False
 
         # Default cursor if not present
@@ -135,7 +135,7 @@ def get_cursor(self, limit=100, cursor=None):
             else:
                 i = 0
 
-            # if we iterated every result and the offset didnt change, we need
+            # if we iterated every result and the offset didn't change, we need
             # to simply add the current offset to our total results (visible)
             if prev_cursor_offset == cursor_offset:
                 prev_offset = offset + i
@@ -149,7 +149,7 @@ def get_cursor(self, limit=100, cursor=None):
         # Truncate the list to our original result size now that we've determined the next page
         results = results[:limit]
 
-        # XXX: We convert datetimes to unix_time and bump 7 decimal places so we dont
+        # XXX: We convert datetimes to unix_time and bump 7 decimal places so we don't
         # have to worry about float point restrictions. This conversion is also handled
         # in the CursorTimestamp validator
         if isinstance(next_cursor_offset, datetime.datetime):
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
@@ -604,7 +604,7 @@
 # characters
 SENTRY_MAX_EXTRA_VARIABLE_SIZE = 4096
 
-# For various attributes we dont limit the entire attribute on size, but the
+# For various attributes we don't limit the entire attribute on size, but the
 # individual item. In those cases we also want to limit the maximum number of
 # keys
 SENTRY_MAX_DICTIONARY_ITEMS = 50
diff --git a/src/sentry/interfaces.py b/src/sentry/interfaces.py
@@ -626,7 +626,7 @@ def get_context(self, event, is_public=False, newest_first=None,
         if len(frames) == system_frames:
             system_frames = 0
 
-        # if theres no system frames, pretend they're all part of the app
+        # if there's no system frames, pretend they're all part of the app
         if not system_frames:
             for frame in frames:
                 frame['in_app'] = True
diff --git a/src/sentry/testutils/asserts.py b/src/sentry/testutils/asserts.py
@@ -8,5 +8,5 @@
 
 
 def assert_date_resembles(one, two):
-    # this is mostly intended to handle discrepencies between mysql/postgres
+    # this is mostly intended to handle discrepancies between mysql/postgres
     assert one.replace(microsecond=0) == two.replace(microsecond=0)
diff --git a/src/sentry/utils/query.py b/src/sentry/utils/query.py
@@ -107,7 +107,7 @@ def __iter__(self):
 class EverythingCollector(Collector):
     """
     More or less identical to the default Django collector except we always
-    return relations (even when they shouldnt matter).
+    return relations (even when they shouldn't matter).
     """
     def collect(self, objs, source=None, nullable=False, collect_related=True,
                 source_attr=None, reverse_dependency=False):
diff --git a/src/sentry/utils/safe.py b/src/sentry/utils/safe.py
@@ -87,7 +87,7 @@ def trim_dict(value, max_items=settings.SENTRY_MAX_DICTIONARY_ITEMS, **kwargs):
 
 
 def trim_frames(stacktrace, max_frames=settings.SENTRY_MAX_STACKTRACE_FRAMES):
-    # TODO: this doesnt account for cases where the client has already omitted
+    # TODO: this doesn't account for cases where the client has already omitted
     # frames
     frames = stacktrace['frames']
     frames_len = len(frames)
diff --git a/src/sentry/web/forms/accounts.py b/src/sentry/web/forms/accounts.py
@@ -138,7 +138,7 @@ def __init__(self, user, *args, **kwargs):
         self.user = user
         super(AccountSettingsForm, self).__init__(*args, **kwargs)
 
-        # dont show username field if its the same as their email address
+        # don't show username field if its the same as their email address
         if self.user.email == self.user.username:
             del self.fields['username']
 
diff --git a/src/sentry/web/frontend/groups.py b/src/sentry/web/frontend/groups.py
@@ -418,7 +418,7 @@ def group(request, team, project, group, event_id=None):
     for item in activity_qs.filter(group=group)[:20]:
         sig = (item.event_id, item.type, item.ident, item.user_id)
         # TODO: we could just generate a signature (hash(text)) for notes
-        # so theres no special casing
+        # so there's no special casing
         if item.type == Activity.NOTE:
             activity.append(item)
         elif sig not in activity_items:
diff --git a/tests/sentry/buffer/base/tests.py b/tests/sentry/buffer/base/tests.py
@@ -36,7 +36,7 @@ def test_process_saves_extra(self):
         group = Group.objects.create(project=Project(id=1))
         columns = {'times_seen': 1}
         filters = {'pk': group.pk}
-        # strip micrseconds because MySQL doesnt seem to handle them correctly
+        # strip micrseconds because MySQL doesn't seem to handle them correctly
         the_date = (timezone.now() + timedelta(days=5)).replace(microsecond=0)
         self.buf.process(Group, columns, filters, {'last_seen': the_date})
         group_ = Group.objects.get(pk=group.pk)
diff --git a/tests/sentry/manager/tests.py b/tests/sentry/manager/tests.py
@@ -50,7 +50,7 @@ def test_valid_only_message(self):
         self.assertEquals(event.project_id, 1)
 
     def test_valid_timestamp_without_tz(self):
-        # TODO: this doesnt error, but it will throw a warning. What should we do?
+        # TODO: this doesn't error, but it will throw a warning. What should we do?
         with self.settings(USE_TZ=True):
             date = datetime.datetime.utcnow()
             event = Group.objects.from_kwargs(1, message='foo', timestamp=date)
@@ -85,7 +85,7 @@ def test_dupe_message_id(self):
         self.assertEquals(event.project_id, 1)
         self.assertEquals(Event.objects.count(), 1)
 
-        # ensure that calling it again doesnt raise a db error
+        # ensure that calling it again doesn't raise a db error
         Group.objects.from_kwargs(1, event_id=1, message='foo')
         self.assertEquals(Event.objects.count(), 1)
 
diff --git a/tests/sentry/utils/query/tests.py b/tests/sentry/utils/query/tests.py
@@ -25,5 +25,5 @@ def test_all_the_things(self):
         assert Project.objects.get(id=project_2.id).owner == user_2
         assert list(ag.members.all()) == [user_2]
 
-        # make sure we didnt remove the instance
+        # make sure we didn't remove the instance
         assert User.objects.filter(id=user_1.id).exists()
diff --git a/tests/sentry/web/frontend/accounts/tests.py b/tests/sentry/web/frontend/accounts/tests.py
@@ -287,7 +287,7 @@ def test_renders_with_required_context(self):
 
     def test_invalid_username(self):
         resp = self.client.post(self.path, {
-            'user': 'nonexistant'
+            'user': 'nonexistent'
         })
         assert resp.status_code == 200
         self.assertTemplateUsed(resp, 'sentry/account/recover/index.html')

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ With that in mind, we recommend the following changes to (some) default configur`
`22`	`22`	`Web Server`
`23`	`23`	`----------`
`24`	`24`
`25`		`-Switching off of the default Sentry worker model and to uWSGI + emporer mode can yield very good results.`
	`25`	`+Switching off of the default Sentry worker model and to uWSGI + emperor mode can yield very good results.`
`26`	`26`
`27`		`-If you're using supervisord, you can easily implement emporer mode and uWSGI yourself by doing something along the lines of:`
	`27`	`+If you're using supervisord, you can easily implement emperor mode and uWSGI yourself by doing something along the lines of:`
`28`	`28`
`29`	`29`	`::`
`30`	`30`
`@@ -101,7 +101,7 @@ Once you're running multiple processes, you'll of course need to also configure`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`-See uWSGI's official documentation for emporer mode details.`
	`104`	`+See uWSGI's official documentation for emperor mode details.`
`105`	`105`
`106`	`106`
`107`	`107`	`Celery`