Commits

Vinay Sajip committed eadefa3 Draft

Removed PYTHON_ARGS #define.

Comments (0)

Files changed (1)

CLILauncher/launcher.c

 
 /* Build options. */
 #define SKIP_PREFIX
-#define PYTHON_ARGS
 #define SEARCH_PATH
 
 /* Error codes */
     void * version_data;
     VS_FIXEDFILEINFO * file_info;
     UINT block_size;
-#if defined(PYTHON_ARGS)
     int index;
-#endif
 #if defined(SCRIPT_WRAPPER)
     int newlen;
     wchar_t * newcommand;
     else {
         p = argv[1];
         plen = wcslen(p);
-#if !defined(PYTHON_ARGS)
-        if (p[0] != L'-') {
-            read_commands();
-            maybe_handle_shebang(&argv[1], command);
-        }
-        /* No file with shebang, or an unrecognised shebang.
-         * Is the first arg a special version qualifier?
-         */
-#endif
         valid = (*p == L'-') && validate_version(&p[1]);
         if (valid) {
             ip = locate_python(&p[1]);
             command += wcslen(p);
             command = skip_whitespace(command);
         }
-#if defined(PYTHON_ARGS)
         else {
             for (index = 1; index < argc; ++index) {
                 if (*argv[index] != L'-')
                 maybe_handle_shebang(&argv[index], command);
             }
         }
-#endif
     }
 #endif
 
             get_version_info(version_text, MAX_PATH);
             fwprintf(stdout, L"\
 Python Launcher for Windows Version %s\n\n", version_text);
-#if defined(PYTHON_ARGS)
             fwprintf(stdout, L"\
-usage: %s [ launcher-arguments ] [python-arguments] script [ script-arguments ]\n\n", argv[0]);
-#else
-            fwprintf(stdout, L"\
-usage: %s [ launcher-arguments ] script [ script-arguments ]\n\n", argv[0]);
-#endif
+usage: %s [ launcher-arguments ] [ python-arguments ] script [ script-arguments ]\n\n", argv[0]);
             fputws(L"\
 Launcher arguments:\n\n\
 -2     : Launch the latest Python 2.x version\n\