Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions analytics/test/module.py

This file was deleted.

6 changes: 3 additions & 3 deletions analytics/__init__.py → segment/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

from analytics.version import VERSION
from analytics.client import Client
from segment.version import VERSION
from segment.client import Client

__version__ = VERSION

Expand Down Expand Up @@ -42,7 +42,7 @@ def flush():
_proxy('flush')

def _proxy(method, *args, **kwargs):
"""Create an analytics client if one doesn't exist and send to it."""
"""Create a segment client if one doesn't exist and send to it."""
global default_client
if not default_client:
default_client = Client(write_key, debug=debug, on_error=on_error,
Expand Down
6 changes: 3 additions & 3 deletions analytics/client.py → segment/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from dateutil.tz import tzutc
from six import string_types

from analytics.utils import guess_timezone, clean
from analytics.consumer import Consumer
from analytics.version import VERSION
from segment.utils import guess_timezone, clean
from segment.consumer import Consumer
from segment.version import VERSION

try:
import queue
Expand Down
4 changes: 2 additions & 2 deletions analytics/consumer.py → segment/consumer.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from threading import Thread
import logging

from analytics.version import VERSION
from analytics.request import post
from segment.version import VERSION
from segment.request import post


class Consumer(Thread):
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion analytics/test/__init__.py → segment/test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def all_names():
for _, modname, _ in pkgutil.iter_modules(__path__):
yield 'analytics.test.' + modname
yield 'segment.test.' + modname

def all():
logging.basicConfig(stream=sys.stderr)
Expand Down
6 changes: 3 additions & 3 deletions analytics/test/client.py → segment/test/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import time
import six

from analytics.version import VERSION
from analytics.client import Client
from segment.version import VERSION
from segment.client import Client


class TestClient(unittest.TestCase):
Expand Down Expand Up @@ -242,4 +242,4 @@ def test_numeric_user_id(self):
self.assertFalse(self.failed)

def test_debug(self):
Client('bad_key', debug=True)
Client('bad_key', debug=True)
2 changes: 1 addition & 1 deletion analytics/test/consumer.py → segment/test/consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
except:
from Queue import Queue

from analytics.consumer import Consumer
from segment.consumer import Consumer


class TestConsumer(unittest.TestCase):
Expand Down
45 changes: 45 additions & 0 deletions segment/test/module.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import unittest

import segment


class TestModule(unittest.TestCase):

def failed(self):
self.failed = True

def setUp(self):
self.failed = False
segment.write_key = 'testsecret'
segment.on_error = self.failed

def test_no_write_key(self):
segment.write_key = None
self.assertRaises(Exception, segment.track)

def test_track(self):
segment.track('userId', 'python module event')
segment.flush()

def test_identify(self):
segment.identify('userId', { 'email': 'user@email.com' })
segment.flush()

def test_group(self):
segment.group('userId', 'groupId')
segment.flush()

def test_alias(self):
segment.alias('previousId', 'userId')
segment.flush()

def test_page(self):
segment.page('userId')
segment.flush()

def test_screen(self):
segment.screen('userId')
segment.flush()

def test_flush(self):
segment.flush()
2 changes: 1 addition & 1 deletion analytics/test/request.py → segment/test/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import unittest
import json

from analytics.request import post, DatetimeSerializer
from segment.request import post, DatetimeSerializer


class TestRequests(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion analytics/test/utils.py → segment/test/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from dateutil.tz import tzutc
import six

from analytics import utils
from segment import utils


class TestUtils(unittest.TestCase):
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from distutils.core import setup

# Don't import analytics-python module here, since deps may not be installed
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'analytics'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'segment'))
from version import VERSION

long_description = '''
Expand All @@ -29,8 +29,8 @@
author_email='friends@segment.com',
maintainer='Segment',
maintainer_email='friends@segment.com',
test_suite='analytics.test.all',
packages=['analytics', 'analytics.test'],
test_suite='segment.test.all',
packages=['segment', 'segment.test'],
license='MIT License',
install_requires=[
'python-dateutil',
Expand Down