Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixed missing import sys, docs, add to .gitignore
  • Loading branch information
Christopher Bare committed Oct 16, 2014
1 parent 542b2ad commit 637a430
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Expand Up @@ -5,5 +5,13 @@ build
dist
virtualenvs
examples_temp
.DS_Store
deploy.sh

doc/_build
junk/
nose.cfg
notes.md
notes/
examples/
jenkins/
6 changes: 3 additions & 3 deletions synapseclient/__init__.py
Expand Up @@ -71,9 +71,9 @@
For more information, see:
- :py:class:`synapseclient.Synapse`
- :py:func:`synapseclient.Synapse.login`
- :py:func:`synapseclient.Synapse.logout`
- :py:class:`Synapse`
- :py:func:`Synapse.login`
- :py:func:`Synapse.logout`
Imports
=======
Expand Down
16 changes: 10 additions & 6 deletions synapseclient/table.py
Expand Up @@ -26,6 +26,7 @@
import json
import os
import re
import sys
import tempfile
from collections import OrderedDict
from itertools import izip
Expand Down Expand Up @@ -348,14 +349,17 @@ def _synapse_delete(self, syn):

def create_table(schema, values, **kwargs):
"""
Combine a table schema and a set of values into a type of Table object.
Combine a table schema and a set of values into some type of Table object
depending on what type of values are given.
:param schema: a table py:class:`Schema` object
:param value: an object that holds the content of the tables
- a py:class:`RowSet`
- a list of lists (or tuples) where each element is a row
- a string holding the path to a CSV file
- a Pandas `DataFrame <http://pandas.pydata.org/pandas-docs/stable/api.html#dataframe>`_
"""

# could be a schema with
# - rowset
# - csv file
# - DataFrame

try:
import pandas as pd
pandas_available = True
Expand Down
1 change: 1 addition & 0 deletions tests/integration/test_tables.py
Expand Up @@ -3,6 +3,7 @@
import math
import os
import random
import sys
import tempfile
import time
import uuid
Expand Down
1 change: 1 addition & 0 deletions tests/unit/unit_test_tables.py
@@ -1,6 +1,7 @@
import math
import csv
import os
import sys
import tempfile
from itertools import izip

Expand Down

0 comments on commit 637a430

Please sign in to comment.