Changeset 40099 for titan/mediathek

Timestamp:

02/25/17 23:19:18 (6 years ago)

Author:

obi

Message:

fix

Location:

titan/mediathek/localhoster/lib/python2.7

Files:

• dummy_thread.pyo (deleted)
• dummy_threading.pyo (deleted)
• encodings/hex_codec.pyo (deleted)
• htmllib.pyo (deleted)
• json/tool.pyo (deleted)
• lib-dynload.sh4/_ssl.so (modified) (previous)
• logging/__init__.pyo (deleted)
• logging/config.pyo (deleted)
• logging/handlers.pyo (deleted)
• md5.pyo (deleted)
• plat-linux2/CDROM.pyo (deleted)
• plat-linux2/DLFCN.pyo (deleted)
• plat-linux2/IN.pyo (deleted)
• plat-linux2/TYPES.pyo (deleted)
• plat-linux2/_sysconfigdata_nd.pyo (deleted)
• posixfile.pyo (deleted)
• site.py (modified) (4 diffs)
• site.pyo (modified) (previous)
• sre.pyo (deleted)
• sysconfig.py (modified) (10 diffs)
• sysconfig.pyo (modified) (previous)

titan/mediathek/localhoster/lib/python2.7/site.py

@@ -19 +19 @@
 resulting directories, if they exist, are appended to sys.path, and
 also inspected for path configuration files.
+
+For Debian and derivatives, this sys.path is augmented with directories
+for packages distributed within the distribution. Local addons go
+into /usr/local/lib/python<version>/dist-packages, Debian addons
+install into /usr/{lib,share}/python<version>/dist-packages.
+/usr/lib/python<version>/site-packages is not used.
 
 A path configuration file is a file whose name has the form
@@ -268 +274 @@
     if ENABLE_USER_SITE and os.path.isdir(user_site):
         addsitedir(user_site, known_paths)
+    if ENABLE_USER_SITE:
+        for dist_libdir in ("local/lib", "lib"):
+            user_site = os.path.join(USER_BASE, dist_libdir,
+                                     "python" + sys.version[:3],
+                                     "dist-packages")
+            if os.path.isdir(user_site):
+                addsitedir(user_site, known_paths)
     return known_paths
 
@@ -289 +302 @@
             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
         elif os.sep == '/':
-            sitepackages.append(os.path.join(prefix, sys.lib,
+            sitepackages.append(os.path.join(prefix, "local/lib",
                                         "python" + sys.version[:3],
-                                        "site-packages"))
-            sitepackages.append(os.path.join(prefix, sys.lib, "site-python"))
-            if sys.lib != "lib":
-                sitepackages.append(os.path.join(prefix, "lib",
-                                            "python" + sys.version[:3],
-                                            "site-packages"))
-                sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+                                        "dist-packages"))
+            sitepackages.append(os.path.join(prefix, "lib",
+                                        "python" + sys.version[:3],
+                                        "dist-packages"))
         else:
             sitepackages.append(prefix)
-            sitepackages.append(os.path.join(prefix, sys.lib, "site-packages"))
+            sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
         if sys.platform == "darwin":
             # for framework builds *only* we add the standard Apple
@@ -442 +452 @@
     here = os.path.dirname(os.__file__)
     __builtin__.license = _Printer(
-        "license", "See https://www.python.org/psf/license/",
+        "license", "See http://www.python.org/psf/license/",
         ["LICENSE.txt", "LICENSE"],
         [os.path.join(here, os.pardir), here, os.curdir])

titan/mediathek/localhoster/lib/python2.7/sysconfig.py

@@ -8 +8 @@
 _INSTALL_SCHEMES = {
     'posix_prefix': {
-        'stdlib': '{base}/'+sys.lib+'/python{py_version_short}',
-        'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}',
-        'purelib': '{base}/'+sys.lib+'/python{py_version_short}/site-packages',
-        'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages',
+        'stdlib': '{base}/lib/python{py_version_short}',
+        'platstdlib': '{platbase}/lib/python{py_version_short}',
+        'purelib': '{base}/lib/python{py_version_short}/site-packages',
+        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+        'include': '{base}/include/python{py_version_short}',
+        'platinclude': '{platbase}/include/python{py_version_short}',
+        'scripts': '{base}/bin',
+        'data': '{base}',
+        },
+    'posix_local': {
+        'stdlib': '{base}/lib/python{py_version_short}',
+        'platstdlib': '{platbase}/lib/python{py_version_short}',
+        'purelib': '{base}/local/lib/python{py_version_short}/dist-packages',
+        'platlib': '{platbase}/local/lib/python{py_version_short}/dist-packages',
+        'include': '{base}/local/include/python{py_version_short}',
+        'platinclude': '{platbase}/local/include/python{py_version_short}',
+        'scripts': '{base}/local/bin',
+        'data': '{base}/local',
+        },
+    'deb_system': {
+        'stdlib': '{base}/lib/python{py_version_short}',
+        'platstdlib': '{platbase}/lib/python{py_version_short}',
+        'purelib': '{base}/lib/python{py_version_short}/dist-packages',
+        'platlib': '{platbase}/lib/python{py_version_short}/dist-packages',
         'include': '{base}/include/python{py_version_short}',
         'platinclude': '{platbase}/include/python{py_version_short}',
@@ -66 +86 @@
         },
     'posix_user': {
-        'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-        'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}',
-        'purelib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
-        'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages',
+        'stdlib': '{userbase}/lib/python{py_version_short}',
+        'platstdlib': '{userbase}/lib/python{py_version_short}',
+        'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
         'include': '{userbase}/include/python{py_version_short}',
         'scripts': '{userbase}/bin',
@@ -130 +150 @@
 
 if _PYTHON_BUILD:
-    for scheme in ('posix_prefix', 'posix_home'):
+    for scheme in ('posix_prefix', 'posix_local', 'deb_system', 'posix_home'):
         _INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include'
         _INSTALL_SCHEMES[scheme]['platinclude'] = '{srcdir}'
@@ -164 +184 @@
 def _get_default_scheme():
     if os.name == 'posix':
-        # the default scheme for posix is posix_prefix
-        return 'posix_prefix'
+        # the default scheme for posix on Debian/Ubuntu is posix_local
+        # FIXME: return dist-packages/posix_prefix only for
+        #   is_default_prefix and 'PYTHONUSERBASE' not in os.environ and 'real_prefix' not in sys.__dict__
+        # is_default_prefix = not prefix or os.path.normpath(prefix) in ('/usr', '/usr/local')
+        return 'posix_local'
     return os.name
 
@@ -232 +255 @@
 
     # do variable interpolation here
-    while notdone:
-        for name in notdone.keys():
+    variables = list(notdone.keys())
+
+    # Variables with a 'PY_' prefix in the makefile. These need to
+    # be made available without that prefix through sysconfig.
+    # Special care is needed to ensure that variable expansion works, even
+    # if the expansion uses the name without a prefix.
+    renamed_variables = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS')
+
+    while len(variables) > 0:
+        for name in tuple(variables):
             value = notdone[name]
             m = _findvar1_rx.search(value) or _findvar2_rx.search(value)
-            if m:
+            if m is not None:
                 n = m.group(1)
                 found = True
@@ -247 +278 @@
                     # do it like make: fall back to environment
                     item = os.environ[n]
+
+                elif n in renamed_variables:
+                    if name.startswith('PY_') and name[3:] in renamed_variables:
+                        item = ""
+
+                    elif 'PY_' + n in notdone:
+                        found = False
+
+                    else:
+                        item = str(done['PY_' + n])
+
                 else:
                     done[n] = item = ""
+
                 if found:
                     after = value[m.end():]
@@ -255 +298 @@
                         notdone[name] = value
                     else:
-                        try: value = int(value)
+                        try:
+                            value = int(value)
                         except ValueError:
                             done[name] = value.strip()
                         else:
                             done[name] = value
-                        del notdone[name]
+                        variables.remove(name)
+
+                        if name.startswith('PY_') \
+                        and name[3:] in renamed_variables:
+
+                            name = name[3:]
+                            if name not in done:
+                                done[name] = value
+
+
             else:
-                # bogus variable reference; just drop it since we can't deal
-                del notdone[name]
+                # bogus variable reference (e.g. "prefix=$/opt/python");
+                # just drop it since we can't deal
+                done[name] = value
+                variables.remove(name)
+
     # strip spurious spaces
     for k, v in done.items():
@@ -278 +334 @@
     if _PYTHON_BUILD:
         return os.path.join(_PROJECT_BASE, "Makefile")
-    return os.path.join(get_path('platstdlib'), "config", "Makefile")
+    return os.path.join(get_config_var('LIBPL'), "Makefile")
 
 # Issue #22199: retain undocumented private name for compatibility
@@ -410 +466 @@
             inc_dir = _PROJECT_BASE
     else:
-        inc_dir = get_path('platinclude')
+        inc_dir = get_path('platinclude').replace("/usr/local","/usr",1)+(sys.pydebug and "_d" or "")
     return os.path.join(inc_dir, 'pyconfig.h')
 
@@ -476 +532 @@
         # the init-function.
         _CONFIG_VARS['userbase'] = _getuserbase()
+
+        multiarch = get_config_var('MULTIARCH')
+        if multiarch:
+            _CONFIG_VARS['multiarchsubdir'] = '/' + multiarch
+        else:
+            _CONFIG_VARS['multiarchsubdir'] = ''
 
         if 'srcdir' not in _CONFIG_VARS: