From f3180698f13b761e44a62ec8577f8075d2afb75c Mon Sep 17 00:00:00 2001 From: minghu6 Date: Fri, 27 May 2016 22:48:16 +0800 Subject: [PATCH] first commit --- setup.py | 4 ++-- you-get | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 21246c5f..b8133a18 100755 --- a/setup.py +++ b/setup.py @@ -13,8 +13,8 @@ try: except: README = "" CHANGELOG = open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf-8').read() -VERSION = imp.load_source('version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)).__version__ - +#VERSION = imp.load_source('version', os.path.join(here, 'src/%s/version.py' % PACKAGE_NAME)).__version__ +VERSION = imp.load_source('version', os.path.join(here, 'src', PACKAGE_NAME, 'version.py')).__version__ from setuptools import setup, find_packages setup( name = proj_info['name'], diff --git a/you-get b/you-get index 8529388f..0bfa9d07 100755 --- a/you-get +++ b/you-get @@ -1,9 +1,14 @@ #!/usr/bin/env python3 import os, sys -_srcdir = '%s/src/' % os.path.dirname(os.path.realpath(__file__)) -_filepath = os.path.dirname(sys.argv[0]) -sys.path.insert(1, os.path.join(_filepath, _srcdir)) +#_srcdir = '%s/src/' % os.path.dirname(os.path.realpath(__file__)) +_srcdir=os.path.join(os.path.dirname(os.path.realpath(__file__)), 'src') +_filepath = os.path.dirname(sys.argv[0]) # (where repo) + +#sys.path.insert(1, os.path.join(_filepath, _srcdir)) +#恕我愚昧，看不懂上面的语句，极度怀疑是： +sys.path.insert(1, _filepath) +sys.path.insert(1, _srcdir) if sys.version_info[0] == 3: import you_get