summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-03-07 16:50:49 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-03-07 16:50:49 (GMT)
commit777d639a923786c8ea3c527e29fcba00e764c054 (patch)
tree0b794741cc26a5735d3ce44e5bcd00223dfdedeb /Doc
parente525ee3b483889313b62b09b4c9103d18dd9cbb7 (diff)
downloadcpython-777d639a923786c8ea3c527e29fcba00e764c054.zip
cpython-777d639a923786c8ea3c527e29fcba00e764c054.tar.gz
cpython-777d639a923786c8ea3c527e29fcba00e764c054.tar.bz2
Issue #21034: Remove outdated paragraph from venv documentation
Since Python 3.4, there is no need to install pip and setuptools into a venv manually.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/venv.rst5
1 files changed, 0 insertions, 5 deletions
diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst
index e9ede8b..acd1443 100644
--- a/Doc/library/venv.rst
+++ b/Doc/library/venv.rst
@@ -43,11 +43,6 @@ Creating virtual environments
Common installation tools such as ``Setuptools`` and ``pip`` work as
expected with venvs - i.e. when a venv is active, they install Python
packages into the venv without needing to be told to do so explicitly.
- Of course, you need to install them into the venv first: this could be
- done by running ``ez_setup.py`` with the venv activated,
- followed by running ``easy_install pip``. Alternatively, you could download
- the source tarballs and run ``python setup.py install`` after unpacking,
- with the venv activated.
When a venv is active (i.e. the venv's Python interpreter is running), the
attributes :attr:`sys.prefix` and :attr:`sys.exec_prefix` point to the base
f a conditional section!"); } - current->doc=stripLeadingAndTrailingEmptyLines(current->doc); + current->doc=stripLeadingAndTrailingEmptyLines(current->doc,current->docLine); if (current->section==Entry::FILEDOC_SEC && current->doc.isEmpty()) { @@ -2693,8 +2693,10 @@ bool parseCommentBlock(/* in */ ParserInterface *parser, } Debug::print(Debug::CommentScan,0, - "brief=[%s]\ndocs=[%s]\ninbody=[%s]\n===========\n", - current->brief.data(),current->doc.data(),current->inbodyDocs.data() + "brief=[line=%d\n%s]\ndocs=[line=%d\n%s]\ninbody=[line=%d\n%s]\n===========\n", + current->briefLine,current->brief.data(), + current->docLine,current->doc.data(), + current->inbodyLine,current->inbodyDocs.data() ); checkFormula(); @@ -2876,7 +2878,7 @@ static void groupAddDocs(Entry *e,const char *fileName) if (e->section==Entry::MEMBERGRP_SEC) { g_memberGroupDocs=e->brief.stripWhiteSpace(); - e->doc = stripLeadingAndTrailingEmptyLines(e->doc); + e->doc = stripLeadingAndTrailingEmptyLines(e->doc,e->docLine); if (!g_memberGroupDocs.isEmpty() && !e->doc.isEmpty()) { g_memberGroupDocs+="\n\n"; diff --git a/src/config.l b/src/config.l index 2988810..5dfbae3 100644 --- a/src/config.l +++ b/src/config.l @@ -1,7 +1,5 @@ /****************************************************************************** * - * - * * Copyright (C) 1997-2012 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its @@ -872,12 +870,13 @@ void Config::convertStrToVal() static void substEnvVarsInString(QCString &s) { - static QRegExp re("\\$\\([a-z_A-Z0-9]+\\)"); + static QRegExp re("\\$\\([a-z_A-Z0-9.-]+\\)"); + static QRegExp re2("\\$\\([a-z_A-Z0-9.-]+\\([a-z_A-Z0-9.-]+\\)\\)"); // For e.g. PROGRAMFILES(X86) if (s.isEmpty()) return; int p=0; int i,l; //printf("substEnvVarInString(%s) start\n",s.data()); - while ((i=re.match(s,p,&l))!=-1) + while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1) { //printf("Found environment var s.mid(%d,%d)=`%s'\n",i+2,l-3,s.mid(i+2,l-3).data()); QCString env=portable_getenv(s.mid(i+2,l-3)); @@ -1473,7 +1472,8 @@ void Config::check() (Config_getBool("INLINE_INHERITED_MEMB") || Config_getBool("INHERIT_DOCS") || !Config_getBool("HIDE_SCOPE_NAMES") || - !Config_getBool("EXTRACT_PRIVATE") + !Config_getBool("EXTRACT_PRIVATE") || + !Config_getBool("EXTRACT_PACKAGE") ) ) { @@ -1482,15 +1482,18 @@ void Config::check() bool b3 = Config_getBool("HIDE_SCOPE_NAMES"); bool b4 = Config_getBool("EXTRACT_PRIVATE"); bool b5 = Config_getBool("SKIP_FUNCTION_MACROS"); - const char *s1,*s2,*s3,*s4,*s5; + bool b6 = Config_getBool("EXTRACT_PACKAGE"); + const char *s1,*s2,*s3,*s4,*s5,*s6; if (b1) s1=" INLINDE_INHERITED_MEMB = NO (was YES)\n"; else s1=""; if (b2) s2=" INHERIT_DOCS = NO (was YES)\n"; else s2=""; if (!b3) s3=" HIDE_SCOPE_NAMES = YES (was NO)\n"; else s3=""; if (!b4) s4=" EXTRACT_PRIVATE = YES (was NO)\n"; else s4=""; if (b5) s5=" ENABLE_PREPROCESSING = NO (was YES)\n"; else s5=""; + if (!b6) s6=" EXTRACT_PACKAGE = YES (was NO)\n"; else s6=""; + config_err("warning: enabling OPT