fix, lint

gpkit/solution_array.py

@@ -6,7 +6,6 @@
 import pickle
 import gzip
 import pickletools
-import _pickle as cPickle
 import numpy as np
 from .nomials import NomialArray
 from .small_classes import DictOfLists, Strings
@@ -425,14 +424,14 @@ def save(self, filename="solution.pkl", **pickleargs):
     def save_compressed(self, title="solution", **cpickleargs):
         "Pickle a file and then compress it into a file with extension."
         with gzip.open(title + ".pgz", "wb") as f:
-            pickled = cPickle.dumps(self, **cpickleargs)
+            pickled = pickle.dumps(self, **cpickleargs)
             f.write(pickletools.optimize(pickled))
 
     @staticmethod
     def decompress_file(file):
         "Load any compressed pickle file"
         with gzip.open(file, "rb") as f:
-            return cPickle.Unpickler(f).load()
+            return pickle.Unpickler(f).load()
 
     def varnames(self, showvars, exclude):
         "Returns list of variables, optionally with minimal unique names"

gpkit/units.py

@@ -53,7 +53,7 @@ def of_division(self, numerator, denominator):
                 conversion = numerator.units or 1/denominator.units
             try:
                 self.division_cache[key] = float(conversion)
-            except DimensionalityError:
+            except:
                 raise DimensionalityError(numerator, denominator)
         return self.division_cache[key]
 
@@ -66,7 +66,7 @@ def of_product(self, thing1, thing2):
             mul_units = qty((thing1*thing2).units)
             try:
                 self.multiplication_cache[key] = (None, float(mul_units))
-            except DimensionalityError:
+            except:
                 self.multiplication_cache[key] = (mul_units, None)
         return self.multiplication_cache[key]