Merge pull request #71 from ducalpha/fixes_on_mac

Fixes on mac

Author: b4hand

Makefile

@@ -17,8 +17,12 @@ nose:
 unittest:
 	python -m unittest discover -s test
 
-install: build
-	python setup.py install
+# using python setup.py deploys as .egg, causing the model file not found
+# using pip install deploys as a directory, so the model file can be found
+# install: build
+#	python setup.py install
 
 install-pip: build
 	pip install .
+
+install: install-pip

dragnet/util.py

@@ -147,7 +147,6 @@ def get_and_union_features(features):
     else:
         return features
 
-
 def load_pickled_model(filename, dirname=None):
     """
     Load a pickled ``Extractor`` model from disk.
@@ -162,7 +161,7 @@ def load_pickled_model(filename, dirname=None):
         :class:`dragnet.extractor.Extractor`
     """
     if dirname is None:
-        pkg_filename = pkgutil.get_loader('dragnet').get_filename()
+        pkg_filename = pkgutil.get_loader('dragnet').get_filename('dragnet')
         pkg_dirname = os.path.dirname(pkg_filename)
         dirname = os.path.join(pkg_dirname, 'pickled_models', model_path)
     filepath = os.path.join(dirname, filename)

setup.py

@@ -23,6 +23,7 @@
 
 import os.path
 import lxml
+import sys
 
 from setuptools import setup
 from numpy import get_include
@@ -51,7 +52,7 @@ def find_libxml2_include():
     Extension('dragnet.features._readability',
               sources=["dragnet/features/_readability.pyx"],
               include_dirs=[get_include()],
-              extra_compile_args=['-std=c++0x'],
+              extra_compile_args=['-std=c++11'] + (['-mmacosx-version-min=10.9'] if sys.platform.startswith("darwin") else []),
               language="c++"),
     Extension('dragnet.features._kohlschuetter',
               sources=["dragnet/features/_kohlschuetter.pyx"],