Skip to content

G
git-repo
Commit 4ff9501b authored by Matthias Putz's avatar Matthias Putz
Browse files
Options

executed python 2to3 tool

parent 7f958de6
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 156 deletions
.gitignore
View file @ 4ff9501b
bin
*.bak
*.pyc
.repopickle_*
.idea/workspace.xml
View file @ 4ff9501b
......@@ -2,8 +2,38 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/abandon.py" afterPath="$PROJECT_DIR$/subcmds/abandon.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/branches.py" afterPath="$PROJECT_DIR$/subcmds/branches.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/checkout.py" afterPath="$PROJECT_DIR$/subcmds/checkout.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/cherry_pick.py" afterPath="$PROJECT_DIR$/subcmds/cherry_pick.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/command.py" afterPath="$PROJECT_DIR$/command.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/download.py" afterPath="$PROJECT_DIR$/subcmds/download.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/editor.py" afterPath="$PROJECT_DIR$/editor.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/forall.py" afterPath="$PROJECT_DIR$/subcmds/forall.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_command.py" afterPath="$PROJECT_DIR$/git_command.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_config.py" afterPath="$PROJECT_DIR$/git_config.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/git_refs.py" afterPath="$PROJECT_DIR$/git_refs.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/grep.py" afterPath="$PROJECT_DIR$/subcmds/grep.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/help.py" afterPath="$PROJECT_DIR$/subcmds/help.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/info.py" afterPath="$PROJECT_DIR$/subcmds/info.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/init.py" afterPath="$PROJECT_DIR$/subcmds/init.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/list.py" afterPath="$PROJECT_DIR$/subcmds/list.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/portable.py" afterPath="$PROJECT_DIR$/portable.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/manifest.py" afterPath="$PROJECT_DIR$/subcmds/manifest.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/manifest_xml.py" afterPath="$PROJECT_DIR$/manifest_xml.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/overview.py" afterPath="$PROJECT_DIR$/subcmds/overview.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pager.py" afterPath="$PROJECT_DIR$/pager.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/project.py" afterPath="$PROJECT_DIR$/project.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/prune.py" afterPath="$PROJECT_DIR$/subcmds/prune.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/rebase.py" afterPath="$PROJECT_DIR$/subcmds/rebase.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/repo" afterPath="$PROJECT_DIR$/repo" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/repo_trace.py" afterPath="$PROJECT_DIR$/repo_trace.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/stage.py" afterPath="$PROJECT_DIR$/subcmds/stage.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/start.py" afterPath="$PROJECT_DIR$/subcmds/start.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/sync.py" afterPath="$PROJECT_DIR$/subcmds/sync.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/upload.py" afterPath="$PROJECT_DIR$/subcmds/upload.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/subcmds/version.py" afterPath="$PROJECT_DIR$/subcmds/version.py" />
</list>
<ignored path="git-repo.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -11,7 +41,7 @@
<file path="/main.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363601178273" ignored="false" />
<file path="/portable.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363601362487" ignored="false" />
<file path="/a.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363252132925" ignored="false" />
<file path="/a.dummy" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363594579797" ignored="false" />
<file path="/a.dummy" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363602085903" ignored="false" />
<file path="/git_config.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363276044335" ignored="false" />
<file path="/project.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363594862967" ignored="false" />
<file path="/fragment.py" changelist="2c74b80f-dc83-420e-8ea2-4ad07fb0ac68" time="1363277935175" ignored="false" />
......@@ -86,14 +116,32 @@
<file leaf-file-name="main.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state line="143" column="7" selection-start="4420" selection-end="4420" vertical-scroll-proportion="0.0">
<state line="93" column="21" selection-start="3071" selection-end="3071" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#625#662#0" expanded="true" />
<element signature="e#626#640#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="git_config.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor">
<state line="29" column="0" selection-start="843" selection-end="843" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="repo" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/repo">
<provider selected="true" editor-type-id="text-editor">
<state line="121" column="50" selection-start="5652" selection-end="5652" vertical-scroll-proportion="0.3858407">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="portable-pager.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/portable-pager.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -115,18 +163,16 @@
<file leaf-file-name="project.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor">
<state line="822" column="42" selection-start="26091" selection-end="26091" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#601#638#0" expanded="true" />
</folding>
<state line="822" column="42" selection-start="26118" selection-end="26118" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="portable.py" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="portable.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="0" selection-start="447" selection-end="447" vertical-scroll-proportion="0.74336284">
<state line="22" column="38" selection-start="329" selection-end="329" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
......@@ -144,8 +190,10 @@
<file leaf-file-name="git_command.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/git_command.py">
<provider selected="true" editor-type-id="text-editor">
<state line="207" column="6" selection-start="5151" selection-end="5151" vertical-scroll-proportion="0.0">
<folding />
<state line="206" column="6" selection-start="5079" selection-end="5079" vertical-scroll-proportion="0.0">
<folding>
<marker date="1363601821143" expanded="false" signature="603:778" placeholder="import ..." />
</folding>
</state>
</provider>
</entry>
......@@ -159,24 +207,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="command.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/command.py">
<provider selected="true" editor-type-id="text-editor">
<state line="200" column="14" selection-start="6280" selection-end="6280" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/subcmds/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state line="17" column="0" selection-start="614" selection-end="614" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-first>
<split-second>
......@@ -184,9 +214,9 @@
<file leaf-file-name="pager.py" pinned="false" current="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pager.py">
<provider selected="true" editor-type-id="text-editor">
<state line="44" column="4" selection-start="1226" selection-end="1226" vertical-scroll-proportion="0.05235602">
<state line="43" column="4" selection-start="1169" selection-end="1169" vertical-scroll-proportion="0.05235602">
<folding>
<element signature="e#603#640#0" expanded="true" />
<element signature="e#604#613#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -215,15 +245,16 @@
<option value="$PROJECT_DIR$/manifest_xml.py" />
<option value="$PROJECT_DIR$/subcmds/sync.py" />
<option value="$PROJECT_DIR$/git_command.py" />
<option value="$PROJECT_DIR$/git_config.py" />
<option value="$PROJECT_DIR$/subcmds/cherry_pick.py" />
<option value="$PROJECT_DIR$/subcmds/grep.py" />
<option value="$PROJECT_DIR$/color.py" />
<option value="$PROJECT_DIR$/subcmds/status.py" />
<option value="$PROJECT_DIR$/tests/linux-pager.py" />
<option value="$PROJECT_DIR$/project.py" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/portable.py" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/git_config.py" />
<option value="$PROJECT_DIR$/repo" />
</list>
</option>
</component>
......@@ -654,13 +685,13 @@
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.481857" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.47972253" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="SBT Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30406147" sideWeight="0.9375667" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.5144077" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32821077" sideWeight="0.51654214" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32924107" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
......@@ -827,20 +858,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$USER_HOME$/.IntelliJIdea12/system/python_stubs/-2066100795/select.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/linux-pager.py">
<provider selected="true" editor-type-id="text-editor">
<state line="58" column="11" selection-start="1200" selection-end="1200" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
......@@ -871,7 +888,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/command.py">
<provider selected="true" editor-type-id="text-editor">
<state line="200" column="14" selection-start="6280" selection-end="6280" vertical-scroll-proportion="0.0">
<state line="200" column="14" selection-start="6304" selection-end="6304" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
......@@ -899,26 +916,26 @@
</entry>
<entry file="file://$PROJECT_DIR$/git_command.py">
<provider selected="true" editor-type-id="text-editor">
<state line="207" column="6" selection-start="5151" selection-end="5151" vertical-scroll-proportion="0.0">
<folding />
<state line="206" column="6" selection-start="5079" selection-end="5079" vertical-scroll-proportion="0.0">
<folding>
<marker date="1363601821143" expanded="false" signature="603:778" placeholder="import ..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pager.py">
<provider selected="true" editor-type-id="text-editor">
<state line="44" column="4" selection-start="1226" selection-end="1226" vertical-scroll-proportion="0.05235602">
<state line="43" column="4" selection-start="1169" selection-end="1169" vertical-scroll-proportion="0.05235602">
<folding>
<element signature="e#603#640#0" expanded="true" />
<element signature="e#604#613#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/project.py">
<provider selected="true" editor-type-id="text-editor">
<state line="822" column="42" selection-start="26091" selection-end="26091" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#601#638#0" expanded="true" />
</folding>
<state line="822" column="42" selection-start="26118" selection-end="26118" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
......@@ -929,18 +946,32 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/portable.py">
<provider selected="true" editor-type-id="text-editor">
<state line="22" column="38" selection-start="329" selection-end="329" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<provider selected="true" editor-type-id="text-editor">
<state line="143" column="7" selection-start="4420" selection-end="4420" vertical-scroll-proportion="0.0">
<state line="93" column="21" selection-start="3071" selection-end="3071" vertical-scroll-proportion="0.0">
<folding>
<element signature="e#625#662#0" expanded="true" />
<element signature="e#626#640#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/portable.py">
<entry file="file://$PROJECT_DIR$/git_config.py">
<provider selected="true" editor-type-id="text-editor">
<state line="29" column="0" selection-start="843" selection-end="843" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/repo">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="0" selection-start="447" selection-end="447" vertical-scroll-proportion="0.74336284">
<state line="121" column="50" selection-start="5652" selection-end="5652" vertical-scroll-proportion="0.3858407">
<folding />
</state>
</provider>
......
command.py
View file @ 4ff9501b
......@@ -38,7 +38,7 @@ class Command(object):
env_options = self._RegisteredEnvironmentOptions()
for env_key, opt_key in env_options.items():
for env_key, opt_key in list(env_options.items()):
# Get the user-set option value if any
opt_value = getattr(opts, opt_key)
......@@ -139,20 +139,20 @@ class Command(object):
groups = [x for x in re.split(r'[,\s]+', groups) if x]
if not args:
all_projects_list = all_projects.values()
all_projects_list = list(all_projects.values())
derived_projects = {}
for project in all_projects_list:
if submodules_ok or project.sync_s:
derived_projects.update((p.name, p)
for p in project.GetDerivedSubprojects())
#all_projects_list.extend(derived_projects.values())
for projects in [all_projects_list, derived_projects.values()]:
for projects in [all_projects_list, list(derived_projects.values())]:
for project in projects:
if ((missing_ok or project.Exists) and
project.MatchesGroups(groups)):
result.append(project)
else:
self._ResetPathToProjectMap(all_projects.values())
self._ResetPathToProjectMap(list(all_projects.values()))
for arg in args:
project = all_projects.get(arg)
......
editor.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import os
import re
import sys
......
git_command.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import os
import sys
import subprocess
......
git_config.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import pickle
import os
import re
......@@ -26,18 +26,7 @@ try:
except ImportError:
import dummy_threading as _threading
import time
try:
import urllib2
except ImportError:
# For python3
import urllib.request
import urllib.error
else:
# For python2
import imp
urllib = imp.new_module('urllib')
urllib.request = urllib2
urllib.error = urllib2
import urllib.request, urllib.error, urllib.parse
from signal import SIGTERM
from error import GitError, UploadError
......@@ -225,7 +214,7 @@ class GitConfig(object):
d = self._section_dict
if d is None:
d = {}
for name in self._cache.keys():
for name in list(self._cache.keys()):
p = name.split('.')
if 2 == len(p):
section = p[0]
......
git_refs.py
View file @ 4ff9501b
......@@ -66,7 +66,7 @@ class GitRefs(object):
def _NeedUpdate(self):
Trace(': scan refs %s', self._gitdir)
for name, mtime in self._mtime.items():
for name, mtime in list(self._mtime.items()):
try:
if mtime != os.path.getmtime(os.path.join(self._gitdir, name)):
return True
......@@ -89,7 +89,7 @@ class GitRefs(object):
attempts = 0
while scan and attempts < 5:
scan_next = {}
for name, dest in scan.items():
for name, dest in list(scan.items()):
if dest in self._phyref:
self._phyref[name] = self._phyref[dest]
else:
......
main.py
View file @ 4ff9501b
......@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import getpass
import imp
import netrc
......@@ -298,7 +298,7 @@ def _AddPasswordFromUserInput(handler, msg, req):
if user is None:
print(msg)
try:
user = input('User: ')
user = eval(input('User: '))
password = getpass.getpass()
except KeyboardInterrupt:
return
......
manifest_xml.py
View file @ 4ff9501b
......@@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import itertools
import os
import re
import sys
import urllib
import urllib.request, urllib.parse, urllib.error
import xml.dom.minidom
import xml.parsers.expat
......@@ -268,7 +268,7 @@ class XmlManifest(object):
sort_projects.sort()
output_projects(p, e, sort_projects)
sort_projects = [key for key in self.projects.keys()
sort_projects = [key for key in list(self.projects.keys())
if not self.projects[key].parent]
sort_projects.sort()
output_projects(None, root, sort_projects)
......
pager.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import os
import select
import sys
......
project.py
View file @ 4ff9501b
......@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import traceback
import errno
import filecmp
......@@ -79,7 +79,7 @@ def _ProjectHooks():
if _project_hook_list is None:
d = os.path.abspath(os.path.dirname(__file__))
d = os.path.join(d , 'hooks')
_project_hook_list = map(lambda x: os.path.join(d, x), os.listdir(d))
_project_hook_list = [os.path.join(d, x) for x in os.listdir(d)]
return _project_hook_list
......@@ -362,7 +362,7 @@ class RepoHook(object):
'Do you want to allow this script to run '
'(yes/yes-never-ask-again/NO)? ') % (
self._GetMustVerb(), self._script_fullpath)
response = raw_input(prompt).lower()
response = input(prompt).lower()
print()
# User is doing a one-time approval.
......@@ -407,7 +407,7 @@ class RepoHook(object):
# and convert to a HookError w/ just the failing traceback.
context = {}
try:
execfile(self._script_fullpath, context)
exec(compile(open(self._script_fullpath).read(), self._script_fullpath, 'exec'), context)
except Exception:
raise HookError('%s\nFailed to import %s hook; see traceback above.' % (
traceback.format_exc(), self._hook_type))
......@@ -645,7 +645,7 @@ class Project(object):
all_refs = self._allrefs
heads = {}
for name, ref_id in all_refs.items():
for name, ref_id in list(all_refs.items()):
if name.startswith(R_HEADS):
name = name[len(R_HEADS):]
b = self.GetBranch(name)
......@@ -654,7 +654,7 @@ class Project(object):
b.revision = ref_id
heads[name] = b
for name, ref_id in all_refs.items():
for name, ref_id in list(all_refs.items()):
if name.startswith(R_PUB):
name = name[len(R_PUB):]
b = heads.get(name)
......@@ -751,8 +751,8 @@ class Project(object):
out.nl()
paths = list()
paths.extend(di.keys())
paths.extend(df.keys())
paths.extend(list(di.keys()))
paths.extend(list(df.keys()))
paths.extend(do)
paths = list(set(paths))
......@@ -850,13 +850,13 @@ class Project(object):
all_refs = self._allrefs
heads = set()
canrm = {}
for name, ref_id in all_refs.items():
for name, ref_id in list(all_refs.items()):
if name.startswith(R_HEADS):
heads.add(name)
elif name.startswith(R_PUB):
canrm[name] = ref_id
for name, ref_id in canrm.items():
for name, ref_id in list(canrm.items()):
n = name[len(R_PUB):]
if R_HEADS + n not in heads:
self.bare_git.DeleteRef(name, ref_id)
......@@ -867,14 +867,14 @@ class Project(object):
heads = {}
pubed = {}
for name, ref_id in self._allrefs.items():
for name, ref_id in list(self._allrefs.items()):
if name.startswith(R_HEADS):
heads[name[len(R_HEADS):]] = ref_id
elif name.startswith(R_PUB):
pubed[name[len(R_PUB):]] = ref_id
ready = []
for branch, ref_id in heads.items():
for branch, ref_id in list(heads.items()):
if branch in pubed and pubed[branch] == ref_id:
continue
if selected_branch and branch != selected_branch:
......@@ -1210,7 +1210,7 @@ class Project(object):
cmd = ['fetch', remote.name]
cmd.append('refs/changes/%2.2d/%d/%d' \
% (change_id % 100, change_id, patch_id))
cmd.extend(map(str, remote.fetch))
cmd.extend(list(map(str, remote.fetch)))
if GitCommand(self, cmd, bare=True).Wait() != 0:
return None
return DownloadedChange(self,
......@@ -1352,7 +1352,7 @@ class Project(object):
cb = self.CurrentBranch
kill = []
left = self._allrefs
for name in left.keys():
for name in list(left.keys()):
if name.startswith(R_HEADS):
name = name[len(R_HEADS):]
if cb is None or name != cb:
......@@ -1598,7 +1598,7 @@ class Project(object):
ids = set(all_refs.values())
tmp = set()
for r, ref_id in GitRefs(ref_dir).all.items():
for r, ref_id in list(GitRefs(ref_dir).all.items()):
if r not in all_refs:
if r.startswith(R_TAGS) or remote.WritesTo(r):
all_refs[r] = ref_id
......@@ -2066,7 +2066,7 @@ class Project(object):
info = _Info(path, *info)
if info.status in ('R', 'C'):
info.src_path = info.path
info.path = out.next()
info.path = next(out)
r[info.path] = info
return r
finally:
......@@ -2178,7 +2178,7 @@ class Project(object):
if not git_require((1, 7, 2)):
raise ValueError('cannot set config on command line for %s()'
% name)
for k, v in config.items():
for k, v in list(config.items()):
cmdv.append('-c')
cmdv.append('%s=%s' % (k, v))
cmdv.append(name)
......
repo
View file @ 4ff9501b
......@@ -116,18 +116,8 @@ import re
import stat
import subprocess
import sys
try:
import urllib2
except ImportError:
# For python3
import urllib.request
import urllib.error
else:
# For python2
import imp
urllib = imp.new_module('urllib')
urllib.request = urllib2
urllib.error = urllib2
import urllib.request
import urllib.error
home_dot_repo = os.path.expanduser('~/.repoconfig')
gpg_dir = os.path.join(home_dot_repo, 'gnupg')
......
repo_trace.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
import os
REPO_TRACE = 'REPO_TRACE'
......
subcmds/abandon.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from command import Command
from git_command import git
......
subcmds/branches.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from color import Coloring
from command import Command
......@@ -98,13 +98,13 @@ is shown, then the branch appears in all projects.
project_cnt = len(projects)
for project in projects:
for name, b in project.GetBranches().items():
for name, b in list(project.GetBranches().items()):
b.project = project
if name not in all_branches:
all_branches[name] = BranchInfo(name)
all_branches[name].add(b)
names = all_branches.keys()
names = list(all_branches.keys())
names.sort()
if not names:
......
subcmds/checkout.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from command import Command
from progress import Progress
......
subcmds/cherry_pick.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import re
import sys
from command import Command
......
subcmds/download.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import re
import sys
......
subcmds/forall.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
#import fcntl
import re
import os
......
subcmds/grep.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from color import Coloring
from command import PagedCommand
......
subcmds/help.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import re
import sys
from formatter import AbstractFormatter, DumbWriter
......@@ -34,7 +34,7 @@ Displays detailed usage information about a command.
def _PrintAllCommands(self):
print('usage: repo COMMAND [ARGS]')
print('The complete list of recognized repo commands are:')
commandNames = self.commands.keys()
commandNames = list(self.commands.keys())
commandNames.sort()
maxlen = 0
......@@ -56,7 +56,7 @@ Displays detailed usage information about a command.
print('usage: repo COMMAND [ARGS]')
print('The most commonly used repo commands are:')
commandNames = [name
for name in self.commands.keys()
for name in list(self.commands.keys())
if self.commands[name].common]
commandNames.sort()
......
subcmds/info.py
View file @ 4ff9501b
......@@ -92,7 +92,7 @@ class Info(PagedCommand):
self.headtext(p.revisionExpr)
self.out.nl()
localBranches = p.GetBranches().keys()
localBranches = list(p.GetBranches().keys())
self.heading("Local Branches: ")
self.redtext(str(len(localBranches)))
if len(localBranches) > 0:
......@@ -157,7 +157,7 @@ class Info(PagedCommand):
all_branches = []
for project in self.GetProjects(args):
br = [project.GetUploadableBranch(x)
for x in project.GetBranches().keys()]
for x in list(project.GetBranches().keys())]
br = [x for x in br if x]
if self.opt.current_branch:
br = [x for x in br if x.name == project.CurrentBranch]
......
subcmds/init.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import os
import platform
import re
......@@ -160,7 +160,7 @@ to update the working directory files.
not m.config.GetString('repo.mirror') == 'true'):
groups.append(platformize(platform.system().lower()))
elif opt.platform == 'all':
groups.extend(map(platformize, all_platforms))
groups.extend(list(map(platformize, all_platforms)))
elif opt.platform in all_platforms:
groups.extend(platformize(opt.platform))
elif opt.platform != 'none':
......
subcmds/list.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import re
from command import Command, MirrorSafeCommand
......
subcmds/manifest.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import os
import sys
......
subcmds/overview.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
from color import Coloring
from command import PagedCommand
......@@ -42,7 +42,7 @@ are displayed.
all_branches = []
for project in self.GetProjects(args):
br = [project.GetUploadableBranch(x)
for x in project.GetBranches().keys()]
for x in list(project.GetBranches().keys())]
br = [x for x in br if x]
if opt.current_branch:
br = [x for x in br if x.name == project.CurrentBranch]
......
subcmds/prune.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
from color import Coloring
from command import PagedCommand
......
subcmds/rebase.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from command import Command
......
subcmds/stage.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from color import Coloring
......@@ -49,7 +49,7 @@ The '%prog' command stages files to prepare the next commit.
self.Usage()
def _Interactive(self, opt, args):
all_projects = filter(lambda x: x.IsDirty(), self.GetProjects(args))
all_projects = [x for x in self.GetProjects(args) if x.IsDirty()]
if not all_projects:
print('no projects have uncommitted modifications', file=sys.stderr)
return
......@@ -98,7 +98,7 @@ The '%prog' command stages files to prepare the next commit.
_AddI(all_projects[a_index - 1])
continue
p = filter(lambda x: x.name == a or x.relpath == a, all_projects)
p = [x for x in all_projects if x.name == a or x.relpath == a]
if len(p) == 1:
_AddI(p[0])
continue
......
subcmds/start.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from command import Command
from git_config import IsId
......
subcmds/sync.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import netrc
from optparse import SUPPRESS_HELP
import os
......@@ -24,7 +24,7 @@ import socket
import subprocess
import sys
import time
import urllib
import urllib.request, urllib.parse, urllib.error
import xmlrpc
#try:
......@@ -511,8 +511,8 @@ later is required to fix a server side protocol bug.
branch = branch[len(R_HEADS):]
env = os.environ.copy()
if (env.has_key('TARGET_PRODUCT') and
env.has_key('TARGET_BUILD_VARIANT')):
if ('TARGET_PRODUCT' in env and
'TARGET_BUILD_VARIANT' in env):
target = '%s-%s' % (env['TARGET_PRODUCT'],
env['TARGET_BUILD_VARIANT'])
[success, manifest_str] = server.GetApprovedManifest(branch, target)
......@@ -642,7 +642,7 @@ def _PostRepoUpgrade(manifest, quiet=False):
wrapper = WrapperModule()
if wrapper.NeedSetupGnuPG():
wrapper.SetupGnuPG(quiet)
for project in manifest.projects.values():
for project in list(manifest.projects.values()):
if project.Exists:
project.PostRepoUpgrade()
......
subcmds/upload.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import copy
import re
import sys
......@@ -33,7 +33,7 @@ def _ConfirmManyUploads(multiple_branches=False):
print('ATTENTION: You are uploading an unusually high number of commits.')
print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across'
'branches?)')
answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
answer = input("If you are sure you intend to do this, type 'yes': ").strip()
return answer == "yes"
def _die(fmt, *args):
......@@ -234,7 +234,7 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
script.append('')
script = [ x.encode('utf-8')
if issubclass(type(x), unicode)
if issubclass(type(x), str)
else x
for x in script ]
......
subcmds/version.py
View file @ 4ff9501b
......@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import print_function
import sys
from command import Command, MirrorSafeCommand
from git_command import git
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment