Merge branch 'master' of github.com:vmprof/vmprof-python

vmprof · Oct 12, 2016 · 04b2491 · 04b2491
2 parents 2d28830 + 8cac8ec
commit 04b2491
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/docs/jitlog.rst b/docs/jitlog.rst
@@ -25,7 +25,7 @@ The following commands show example usages::
     # upload a jitlog when your program segfaults/crashes
     $ pypy -m jitlog -o /tmp/file.log <program.py> <arguments>
     <Segfault>
-    $ pypy -m jitlog.upload /tmp/file.log
+    $ pypy -m jitlog --upload /tmp/file.log
 
 Data sent
 =========

diff --git a/setup.py b/setup.py
@@ -1,7 +1,6 @@
 from setuptools import setup, find_packages, Extension
 import os, sys
 
-PY3  = sys.version_info[0] >= 3
 IS_PYPY = '__pypy__' in sys.builtin_module_names
 
 if IS_PYPY:
@@ -24,7 +23,7 @@
                             extra_compile_args=extra_compile_args,
                             libraries=[])]
 
-if PY3:
+if sys.version_info[:2] >= (3, 3):
     extra_install_requires = []
 else:
     extra_install_requires = ["backports.shutil_which"]

diff --git a/src/vmprof_main_win32.h b/src/vmprof_main_win32.h