Merge pull request #97 from skirpichev/misc

Misc fixes

.travis.yml

@@ -3,7 +3,7 @@ env:
   matrix:
   - SPLIT="1/2"
   - SPLIT="2/2"
-  - TEST_EXTRA="true" TEST_PEP="true"
+  - TEST_EXTRA="true"
   - TEST_SLOW="true" SPLIT="1/2"
   - TEST_SLOW="true" SPLIT="2/2"
 python:
@@ -29,12 +29,9 @@ before_install:
   - if [[ "${TEST_EXTRA}" == "true" ]]; then
       sudo apt-get update;
       sudo apt-get -qq install libgmp-dev libatlas-dev libatlas-base-dev liblapack-dev gfortran;
-      travis_wait 30 pip install numpy==1.7.1 scipy==0.12.0 gmpy==1.16 Theano==0.6;
+      travis_wait 30 pip install numpy==1.7.1 scipy==0.12.0 gmpy==1.16 Theano==0.6 pep8==1.6.2;
       travis_wait 30 pip install matplotlib==1.3.1;
     fi
-  - if [[ "${TEST_PEP}" == "true" ]]; then
-      pip install pep8==1.6.2;
-    fi
   - pip install pytest==2.7.0
   - if [[ "${TRAVIS_PYTHON_VERSION}" == "2.7" ]]; then
       pip install pytest-cov coveralls --use-mirrors;
@@ -47,7 +44,7 @@ before_script:
       export DISPLAY=:99.0;
     fi
 script:
-  - if [[ "${TEST_PEP}" == "true" ]]; then
+  - if [[ "${TEST_EXTRA}" == "true" ]]; then
       pep8;
     fi
   - bin/test_travis.sh

sympy/core/add.py

@@ -758,8 +758,10 @@ def primitive(self):
         >>> ((2 + 2*x)*x + 2).as_content_primitive()
         (2, x*(x + 1) + 1)
 
-        See also: primitive() function in polytools.py
+        See Also
+        ========
 
+        sympy.polys.polytools.primitive
         """
 
         terms = []
@@ -825,7 +827,10 @@ def as_content_primitive(self, radical=False):
         >>> (2*sqrt(2) + 4*sqrt(10)).as_content_primitive(radical=True)
         (2, sqrt(2)*(1 + 2*sqrt(5)))
 
-        See docstring of Expr.as_content_primitive for more examples.
+        See Also
+        ========
+
+        sympy.core.expr.Expr.as_content_primitive
         """
         con, prim = self.func(*[_keep_coeff(*a.as_content_primitive(
             radical=radical)) for a in self.args]).primitive()